diff options
| author |   Tal Gitelman <tg851x@intl.att.com> | 2017-10-29 15:23:48 +0200 |
|---|---|---|
| committer | Tal Gitelman <tg851x@intl.att.com> | 2017-10-29 15:23:48 +0200 |
| commit | 36f480d9b77815d7d7c8f12afc09ceb7e8228365 (patch) | |
| tree | c688c13fbd0a1c29ef4968d05ee09a1d92f605a9 /sdc-os-chef | |
| parent | 6020a101a6a1913a4eee34883b0abdbe2da95b13 (diff) | |
Nodes in service template fix(Revert)
Reverting previous commit
Fail to get correct labels of requirements of nodes in service
template fixed
Change-Id: I4f9241441498e37bc508660dfdba6817d9462e1a
Issue-ID: SDC-533
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'sdc-os-chef')
| -rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 2 | ||||
| -rw-r--r-- | sdc-os-chef/sdc-sanity/startup.sh | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index dc6b075f8d..417db0994c 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -26,7 +26,7 @@ function monitor_docker { echo monitor $1 Docker -TIME_OUT=240 +TIME_OUT=180 INTERVAL=20 TIME=0 while [ "$TIME" -lt "$TIME_OUT" ]; do diff --git a/sdc-os-chef/sdc-sanity/startup.sh b/sdc-os-chef/sdc-sanity/startup.sh index e06cf84b88..d4316c383f 100644 --- a/sdc-os-chef/sdc-sanity/startup.sh +++ b/sdc-os-chef/sdc-sanity/startup.sh @@ -1,7 +1,5 @@ #!/bin/bash -sleep 300 - export CHEFNAME=${ENVNAME} cd /root/chef-solo chef-solo -c solo.rb -E ${CHEFNAME} |