X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae2_vm_init.sh;h=0ae1549ab288f9593dc69a96adcd63fe41f579ad;hb=refs%2Fheads%2Famsterdam;hp=a79b9c190f8c4acb63130e3671207f3a43359eba;hpb=74cb51c88f99f9128d43f4645c6f2aa86163d43b;p=demo.git

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
old mode 100644
new mode 100755
index a79b9c19..0ae1549a
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -160,8 +160,8 @@ register_multicloud_pod25dns_with_aai()
     local CLOUD_ENV
     local CLOUD_IDENTITY_URL
     local DNSAAS_SERVICE_URL
-    local DNSAAS_USERNAME='demo'
-    local DNSAAS_PASSWORD='onapdemo'
+    local DNSAAS_USERNAME="$(cat /opt/config/dnsaas_username.txt)"
+    local DNSAAS_PASSWORD="$(cat /opt/config/dnsaas_password.txt)"
 
     CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
@@ -344,7 +344,7 @@ verify_multicloud_registration()
 }
 
 
-register_dns_zone()
+register_dns_zone_proxied_designate()
 {
     local CLOUD_OWNER='pod25' 
     local CLOUD_REGION
@@ -397,7 +397,7 @@ register_dns_zone()
     fi
 
     local PROJECTID
-    PROJECTID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |sed 's/^.*"project_id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
+    PROJECTID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |grep 'project_id' |sed 's/^.*"project_id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
     if [ ! -z "$PROJECTID" ]; then 
         ### query the zone with zone id
         echo "!!!!!!> zone $ZONENAME already registered by project $PROJECTID"
@@ -416,8 +416,8 @@ register_dns_zone()
     #curl -s -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}"
 
     ### export ZONE id
-    #local ZONEID
-    #ZONEID=$(curl -v -s  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |sed 's/^.*"id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
+    local ZONEID
+    ZONEID=$(curl -v -sb  -H "Content-Type: application/json" -H "X-Auth-Token: $TOKEN" -X GET "${MULTICLOUD_PLUGIN_ENDPOINT}/dns-delegate/v2/zones?name=${ZONENAME}" |grep 'id' |sed 's/^.*"id":"\([a-zA-Z0-9-]*\)",.*$/\1/')
     echo "=====> After creation, zone $ZONENAME ID is $ZONEID"
 
     ### query the zone with zone id
@@ -426,6 +426,92 @@ register_dns_zone()
 }
 
 
+register_dns_zone_designate()
+{
+    local HEADER_CONTENT_TYPE_JSON="Content-Type: application/json"
+    local HEADER_ACCEPT_JSON="Accept: application/json"
+    local HEADER_TOKEN
+    local DCAE_ZONE
+    local DCAE_DOMAIN
+    local ZONE_NAME
+    local ZONE_ID
+    local KEYSTONE_URL
+    local API_ENDPOINT
+    local API_DATA
+    local TENANT_NAME
+    local TENANT_ID
+    local ZONE_PROJECT_ID
+    
+    if [ -z "$1" ]; then DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"; else DCAE_ZONE="$1"; fi
+    DCAE_DOMAIN="$(cat /opt/config/dcae_domain.txt)"
+    ZONE_NAME="${DCAE_ZONE}.${DCAE_DOMAIN}."
+
+    TENANT_NAME="$(cat /opt/config/tenant_name.txt)"
+    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)"
+
+
+    API_ENDPOINT="${KEYSTONE_URL}/tokens"
+    API_DATA="{\"auth\": {\"project\": \"${TENANT_NAME}\", \"tenantId\": \"${TENANT_ID}\", \"passwordCredentials\": {\"username\": \"${USERNAME}\", \"password\": \"${PASSWORD}\"}}}"
+    
+    echo "===> Getting token from ${API_ENDPOINT}"
+    RESP=$(curl -s -v -H "${HEADER_CONTENT_TYPE_JSON}" -d "${API_DATA}" "${API_ENDPOINT}")
+
+    TOKEN="$(echo ${RESP} | jq -r .access.token.id)"
+    if [ -z "$TOKEN" ]; then
+        echo "Faile to acquire token for creating DNS zone.  Exit"
+        exit 1
+    fi
+    HEADER_TOKEN="X-Auth-Token: ${TOKEN}" 
+ 
+
+    DESIGNATE_URL=$(echo ${RESP} | jq -r '.access.serviceCatalog[] | select(.name=="designate") | .endpoints[0].publicURL')
+    if [ -z ${DESIGNATE_URL} ]; then
+        echo "Fail to find Designate API endpoint.  Exit"
+        exit 1
+    fi
+
+
+    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)
+    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"
+        API_DATA="{\"name\": \"${ZONE_NAME}\", \"email\": \"dcae@onap.org\", \"type\": \"PRIMARY\", \"ttl\": 7200, \"description\": \"DCAE DNS zoen created for ONAP deployment $DCAE_ZONE\"}"
+        RESP=$(curl -s -v -X POST -H "$HEADER_ACCEPT_JSON" -H "$HEADER_CONTENT_TYPE_JSON" -H "$HEADER_TOKEN" -d "$API_DATA" "$API_ENDPOINT")
+        ZONE_ID=$(echo $RESP | jq .id)
+
+        if [ -z "$ZONE_ID" ]; then
+            echo "Fail to create DNS zone ${ZONE_NAME}.  Exit"
+            exit 1
+        fi
+    else
+        echo "======> Zone ${ZONE_NAME} already exists."
+        API_ENDPOINT="${DESIGNATE_URL}/v2/zones/${ZONE_ID}"
+        RESP=$(curl -s -v -H "$HEADER_ACCEPT_JSON" -H "$HEADER_TOKEN" "$API_ENDPOINT")
+        ZONE_PROJECT_ID=$(echo $RESP | jq -r .project_id)
+        if [ "$ZONE_PROJECT_ID" != "noauth-project" ] && [ "$ZONE_PROJECT_ID" != "$TENANT_ID" ]; then
+            echo "======> Zone ${ZONE_NAME} owned by other projects, may have problem creating records"
+        else
+            echo "======> Zone ${ZONE_NAME} okay to create new records"
+        fi
+    fi
+}
+
 delete_dns_zone()
 {
     local CLOUD_OWNER='pod25'
@@ -541,10 +627,11 @@ if [ "$DNSAAS_PROXYED" == 'true' ]; then
     verify_multicloud_registration
 
     wait_for_multicloud_ready
-    register_dns_zone "$ZONE" 
+    register_dns_zone_proxied_designate "$ZONE" 
     echo "Registration and configuration for proxying DNSaaS completed."
 else
-    echo "Using proxyed DNSaaS service, performing additional registration and configuration"
+    echo "Using Designate DNSaaS service, performing additional registration and configuration"
+    register_dns_zone_designate "$ZONE" 
 fi
 
 
@@ -562,7 +649,7 @@ rm -f /opt/config/runtime.ip.cm
 
 #docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO"
 #docker pull "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
-#docker run -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
+docker run -d --name boot -v /opt/app/config:/opt/app/installer/config -e "LOCATION=$ZONE" "$NEXUS_DOCKER_REPO/onap/org.onap.dcaegen2.deployments.bootstrap:$DOCKER_VERSION"
 
 
 # waiting for bootstrap to complete then starting nginx for proxying healthcheck calls