Fix for DCAEGEN2-376

[demo.git] / boot / dcae2_vm_init.sh

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index 570cb70..c8ab317 100755 (executable)
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -450,6 +450,15 @@ register_dns_zone_designate()
     TENANT_ID="$(cat /opt/config/tenant_id.txt)"
 
     KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
+    if [[ "$KEYSTONE_URL" == */v3 ]]; then
+        echo "$KEYSTONE_URL"
+    elif [[ "$KEYSTONE_URL" == */v2.0 ]]; then
+        echo "$KEYSTONE_URL"
+    else
+        KEYSTONE_URL="${KEYSTONE_URL}/v2.0"
+        echo "$KEYSTONE_URL"
+    fi
+
     USERNAME="$(cat /opt/config/openstack_user.txt)"
     PASSWORD="$(cat /opt/config/openstack_password.txt)"
 
@@ -478,7 +487,7 @@ register_dns_zone_designate()
     API_ENDPOINT="${DESIGNATE_URL}/v2/zones"
     echo "===> Register DNS zone $ZONE_NAME at Designate API endpoint ${API_ENDPOINT}"
    
-    RESP=$(curl -v -s -H $HEADER_TOKEN $API_ENDPOINT)
+    RESP=$(curl -v -s -H "$HEADER_TOKEN" "$API_ENDPOINT")
     ZONE_ID=$(echo $RESP |jq -r --arg ZONE_NAME "$ZONE_NAME" '.zones[] |select(.name==$ZONE_NAME) |.id')
     if [ -z "$ZONE_ID" ]; then
         echo "======> Zone ${ZONE_NAME} does not exist.  Create"