diff options
author | Tal Gitelman <tg851x@intl.att.com> | 2017-10-29 15:13:17 +0200 |
---|---|---|
committer | Tal Gitelman <tg851x@intl.att.com> | 2017-10-29 15:13:17 +0200 |
commit | cbacd7fe477ee03fed8902cb1d01c7d249c960b9 (patch) | |
tree | eddb9d41948f6171dc06c39f411fb604ec7e6f4a /sdc-os-chef | |
parent | f981fb475bc70ea016a6a1eca43d346825e65f8f (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: Ic80069e95f6f06fcc7235aebee6bfe13cab80ab5
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 53ee6bafe6..c0ee35f068 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 sleep 5 -TIME_OUT=240 +TIME_OUT=600 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 dc881fed51..e4edfc67e6 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} |