From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 16 Jan 2017 10:06:36 +0000 (+0000)
Subject: Merge "Continue checking for request url if initially null"
X-Git-Tag: opnfv-6.0.0~1241
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e0d1ab8da4950d2ae7c82992289ae60ee5fb363b;hp=7f7de5492583558a627cbc4a6a29ed69e4bb7f17;p=apex-tripleo-heat-templates.git

Merge "Continue checking for request url if initially null"
---

diff --git a/deployed-server/scripts/get-occ-config.sh b/deployed-server/scripts/get-occ-config.sh
index 404244b1..6c196f97 100755
--- a/deployed-server/scripts/get-occ-config.sh
+++ b/deployed-server/scripts/get-occ-config.sh
@@ -79,7 +79,14 @@ for role in $OVERCLOUD_ROLES; do
             server_stack=$(openstack stack resource show $stack $server_resource_name -c physical_resource_id -f value)
         done
 
-        deployed_server_metadata_url=$(openstack stack resource metadata $server_stack deployed-server | jq -r '.["os-collect-config"].request.metadata_url')
+        while true; do
+            deployed_server_metadata_url=$(openstack stack resource metadata $server_stack deployed-server | jq -r '.["os-collect-config"].request.metadata_url')
+            if [ "$deployed_server_metadata_url" = "null" ]; then
+                continue
+            else
+                break
+            fi
+        done
 
         echo "======================"
         echo "$role$i os-collect-config.conf configuration:"