diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-11-01 10:37:33 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2019-11-01 10:37:42 -0500 |
| commit | 4b4735f68fd916c443f7a8c860e6f7623491408b (patch) | |
| tree | e760f861f1027d854c6e78c5d4d1ebe46d1bfa79 | |
| parent | a2b067147e6681459922ca2525e7611336e9dad0 (diff) | |
Fix if/fi on stack create
Issue-ID: INT-1217
Change-Id: I94a9d2a4f3e98a2c08ee7dc2af40c6fc718c23f4
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rwxr-xr-x | deployment/heat/onap-rke/scripts/deploy.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/deployment/heat/onap-rke/scripts/deploy.sh b/deployment/heat/onap-rke/scripts/deploy.sh index 935e69424..1a1791e09 100755 --- a/deployment/heat/onap-rke/scripts/deploy.sh +++ b/deployment/heat/onap-rke/scripts/deploy.sh @@ -156,11 +156,13 @@ for n in $(seq 1 5); do fi if [ "$branch" == "staging" ] ; then - if ! openstack stack create -t ./onap-oom.yaml~ -e $ENV_FILE~ $stack_name --parameter integration_gerrit_branch=$integration_gerrit_branch --parameter oom_gerrit_branch=$oom_gerrit_branch --parameter portal_hostname=$portal_hostname --parameter additional_override="~/integration/deployment/heat/onap-rke/staging-image-override.yaml" ; then + if ! openstack stack create -t ./onap-oom.yaml~ -e $ENV_FILE~ $stack_name --parameter integration_gerrit_branch=$integration_gerrit_branch --parameter oom_gerrit_branch=$oom_gerrit_branch --parameter portal_hostname=$portal_hostname --parameter additional_override='~/integration/deployment/heat/onap-rke/staging-image-override.yaml' ; then break + fi else if ! openstack stack create -t ./onap-oom.yaml~ -e $ENV_FILE~ $stack_name --parameter integration_gerrit_branch=$integration_gerrit_branch --parameter oom_gerrit_branch=$oom_gerrit_branch --parameter portal_hostname=$portal_hostname; then break + fi fi while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value $stack_name)" ]; do @@ -184,6 +186,7 @@ for n in $(seq 1 5); do echo Error: OpenStack infrastructure issue: unable to reach NFS server "$NFS_IP" sleep 10 + done if ! timeout 1 ping -c 1 "$NFS_IP"; then |