diff options
author | Vijay Venkatesh Kumar <vv770d@att.com> | 2017-11-01 16:08:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-11-01 16:08:13 +0000 |
commit | 6190b618252862e24706f200e3cfeb5aa561762b (patch) | |
tree | 1d243667dd7dd103f539201b866e66f8e06f4263 | |
parent | 9545d42fd52c2eadd4eaf83efdeb529351294dca (diff) | |
parent | 73e66b913bfad7105f94a84f3f957620fb12bcba (diff) |
Merge "add loop to ensure DHCP ran"
-rw-r--r-- | blueprints/pgaas-cluster.yaml-template | 15 | ||||
-rw-r--r-- | blueprints/pgaas-onevm.yaml-template | 15 | ||||
-rw-r--r-- | blueprints/pgaas.yaml-template | 15 |
3 files changed, 42 insertions, 3 deletions
diff --git a/blueprints/pgaas-cluster.yaml-template b/blueprints/pgaas-cluster.yaml-template index 6ad8901..9a85288 100644 --- a/blueprints/pgaas-cluster.yaml-template +++ b/blueprints/pgaas-cluster.yaml-template @@ -64,7 +64,20 @@ inputs: then echo WARNING WARNING WARNING echo The DNS DHCP settings did not work properly. - exit 1 + for i in $(seq 20) + do + echo Sleeping... + sleep 10 + if [ "$(dnsdomainname 2>/dev/null)" != "" ] + then break + fi + echo The DNS DHCP settings still did not work properly. + done + if [ "$(dnsdomainname 2>/dev/null)" = "" ] + then + echo Exiting + exit 1 + fi fi CONFDIR=/var/config/DCAE/chef/ diff --git a/blueprints/pgaas-onevm.yaml-template b/blueprints/pgaas-onevm.yaml-template index 1575374..ec7aa36 100644 --- a/blueprints/pgaas-onevm.yaml-template +++ b/blueprints/pgaas-onevm.yaml-template @@ -57,7 +57,20 @@ inputs: then echo WARNING WARNING WARNING echo The DNS DHCP settings did not work properly. - exit 1 + for i in $(seq 20) + do + echo Sleeping... + sleep 10 + if [ "$(dnsdomainname 2>/dev/null)" != "" ] + then break + fi + echo The DNS DHCP settings still did not work properly. + done + if [ "$(dnsdomainname 2>/dev/null)" = "" ] + then + echo Exiting + exit 1 + fi fi CONFDIR=/var/config/DCAE/chef/ diff --git a/blueprints/pgaas.yaml-template b/blueprints/pgaas.yaml-template index 9158e79..245b564 100644 --- a/blueprints/pgaas.yaml-template +++ b/blueprints/pgaas.yaml-template @@ -57,7 +57,20 @@ inputs: then echo WARNING WARNING WARNING echo The DNS DHCP settings did not work properly. - exit 1 + for i in $(seq 20) + do + echo Sleeping... + sleep 10 + if [ "$(dnsdomainname 2>/dev/null)" != "" ] + then break + fi + echo The DNS DHCP settings still did not work properly. + done + if [ "$(dnsdomainname 2>/dev/null)" = "" ] + then + echo Exiting + exit 1 + fi fi CONFDIR=/var/config/DCAE/chef/ |