X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=boot%2Fdcae2_vm_init.sh;h=29c2fa9532de92bae436925f76f059df8f3a8e1c;hb=2871669ad9a0db36280fd1bcb7ff9d12066d1369;hp=d26bb47a8f62b4ef6878f58d776dba83c3cdfe27;hpb=38322831c7591dbecc41e4d90a38a556c1c47230;p=demo.git

diff --git a/boot/dcae2_vm_init.sh b/boot/dcae2_vm_init.sh
index d26bb47a..29c2fa95 100755
--- a/boot/dcae2_vm_init.sh
+++ b/boot/dcae2_vm_init.sh
@@ -21,6 +21,9 @@
 # parameters: URL METHOD CURLOPTIONS EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA
 assemble_curl_command()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local URL="$1"
     local METHOD="$2"
     local CURLOPTIONS="$3"
@@ -51,6 +54,9 @@ assemble_curl_command()
 # parameters: URL METHOD expected_response_code EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA
 call_api_for_response_code()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CURLOPTIONS='-kIso /dev/null -w "%{http_code}"'
     read -r CMDF <<-END
 $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6")
@@ -59,6 +65,9 @@ END
 }
 call_api_for_response_body()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CURLOPTIONS='-ksb'
     read -r CMDF <<-END
 $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6")
@@ -66,7 +75,10 @@ END
     eval "$CMDF"
 }
 call_api_for_response_header()
-{  
+{
+    export http_proxy=""
+    export https_proxy=""
+	
     local CURLOPTIONS='-ks -o /dev/null -D -'
     read -r CMDF <<-END
 $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6")
@@ -74,7 +86,10 @@ END
     eval "$CMDF"
 }
 call_api_for_verbose()
-{ 
+{
+    export http_proxy=""
+    export https_proxy=""
+	
     local CURLOPTIONS='-kIv'
     read -r CMDF <<-END
 $(assemble_curl_command "$1" "$2" "$CURLOPTIONS" "$4" "$5" "$6")
@@ -91,6 +106,9 @@ END
 # parameters: URL METHOD EXPECTED_RESP_CODE EXTRA_HEADERS_AS_A_STRING AUTH_AS_USER:PASS DATA
 wait_for_api()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local RESP="$3" 
     local ACTUALRESP
     ACTUALRESP=$(call_api_for_response_code "$1" "$2" "$3" "$4" "$5" "$6")
@@ -105,7 +123,10 @@ wait_for_api()
 # Wait till a TCP port is open
 # parameters: HOST PORT
 wait_for_tcp_port()
-{  
+{
+    export http_proxy=""
+    export https_proxy=""
+	
     local DEST="$1"
     local PORT="$2"
     while ! nc -z -w 1 "$DEST" "$PORT"; do
@@ -119,6 +140,9 @@ wait_for_tcp_port()
 
 wait_for_aai_ready()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     # wait till A&AI up and ready
     local AAIHOST
     AAIHOST=$(cat /opt/config/aai1_ip_addr.txt)
@@ -137,10 +161,13 @@ wait_for_aai_ready()
 
 wait_for_multicloud_ready()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     # wait till MultiCloud up and ready
     local MCHOST
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
-    local MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
+    local MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
     local MCMETHOD='-X GET'
     local MCRESP='200'
     local MCHEADERS='-H "Real-Time: true" -H "Content-Type: application/json" -H "Accept: application/json"'
@@ -153,6 +180,9 @@ wait_for_multicloud_ready()
 
 register_multicloud_pod25dns_with_aai()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     # Register MultiCloud with A&AI
     local CLOUD_OWNER='pod25dns'
     local CLOUD_VERSION='titanium_cloud'
@@ -165,8 +195,8 @@ register_multicloud_pod25dns_with_aai()
 
     CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
-    MCIP="$(cat /opt/config/openo_ip_addr.txt)"
-    CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
+    CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
 
     local RESPCODE
     DNSAAS_SERVICE_URL="$(cat /opt/config/dnsaas_keystone_url.txt)"
@@ -227,7 +257,10 @@ EOL
 
 
 register_multicloud_pod25_with_aai()
-{ 
+{
+    export http_proxy=""
+    export https_proxy=""
+	
     # Register MultiCloud with A&AI
     local CLOUD_OWNER='pod25'
     local CLOUD_VERSION='titanium_cloud'
@@ -244,8 +277,8 @@ register_multicloud_pod25_with_aai()
     CLOUD_REGION="$(cat /opt/config/openstack_region.txt)"
     DNSAAS_CLOUD_REGION="$(cat /opt/config/dnsaas_region.txt)"
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
-    MCIP="$(cat /opt/config/openo_ip_addr.txt)"
-    CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
+    CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
     KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
     if [[ "$KEYSTONE_URL" == */v3 ]]; then
         echo "$KEYSTONE_URL"
@@ -315,6 +348,9 @@ EOL
 
 verify_multicloud_registration() 
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CLOUD_OWNER='pod25'
     local CLOUD_REGION
     local CLOUD_VERSION='titanium_cloud'
@@ -346,6 +382,9 @@ verify_multicloud_registration()
 
 register_dns_zone_proxied_designate()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CLOUD_OWNER='pod25' 
     local CLOUD_REGION
     local CLOUD_VERSION='titanium_cloud'
@@ -366,11 +405,11 @@ register_dns_zone_proxied_designate()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     if [ -z "$1" ]; then DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"; else DCAE_ZONE="$1"; fi
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
-    MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
+    MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
 
     MCDATA='-d "{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
-    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
 
      ### zone operations
      # because all VM's use 10.0.100.1 as their first DNS server, the designate DNS server as seocnd, we need to use a
@@ -428,6 +467,9 @@ register_dns_zone_proxied_designate()
 
 register_dns_zone_designate()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local HEADER_CONTENT_TYPE_JSON="Content-Type: application/json"
     local HEADER_ACCEPT_JSON="Accept: application/json"
     local HEADER_TOKEN
@@ -514,6 +556,9 @@ register_dns_zone_designate()
 
 delete_dns_zone()
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CLOUD_OWNER='pod25'
     local CLOUD_REGION
     local CLOUD_VERSION='titanium_cloud'
@@ -533,8 +578,8 @@ delete_dns_zone()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
-    MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
+    MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
 
     local DCAE_DOMAIN
     local ZONENAME
@@ -542,7 +587,7 @@ delete_dns_zone()
     ZONENAME="${DCAE_ZONE}.${DCAE_DOMAIN}."
 
     MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
-    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
 
     ### Get Token
     local TOKEN
@@ -556,6 +601,9 @@ delete_dns_zone()
 
 list_dns_zone() 
 {
+    export http_proxy=""
+    export https_proxy=""
+	
     local CLOUD_OWNER='pod25'
     local CLOUD_REGION
     local CLOUD_VERSION='titanium_cloud'
@@ -575,11 +623,11 @@ list_dns_zone()
     CLOUD_ENV="$(cat /opt/config/cloud_env.txt)"
     DCAE_ZONE="$(cat /opt/config/dcae_zone.txt)"
     DNSAAS_TENANT_NAME="$(cat /opt/config/dnsaas_tenant_name.txt)"
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
-    MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
+    MCURL="http://$MCHOST:9005/api/multicloud-titaniumcloud/v0/swagger.json"
 
     MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
-    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
+    MULTICLOUD_PLUGIN_ENDPOINT=http://${MCHOST}/api/multicloud-titaniumcloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}
 
     ### Get Token
     local TOKEN
@@ -626,7 +674,14 @@ DOCKER_VERSION=$(cat /opt/config/docker_version.txt)
 ZONE=$(cat /opt/config/rand_str.txt)
 MYFLOATIP=$(cat /opt/config/dcae_float_ip.txt)
 MYLOCALIP=$(cat /opt/config/dcae_ip_addr.txt)
+HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
+HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
+if [ $HTTP_PROXY != "no_proxy" ]
+then
+    export http_proxy=$HTTP_PROXY
+    export https_proxy=$HTTPS_PROXY
+fi
 
 # start docker image pulling while we are waiting for A&AI to come online
 docker login -u "$NEXUS_USER" -p "$NEXUS_PASSWORD" "$NEXUS_DOCKER_REPO"
@@ -718,7 +773,7 @@ if [[ $DEPLOYMENT_PROFILE == R2* ]]; then
   wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/docker-compose-4.yaml
   wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/register.sh
   wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/setup.sh
-  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/build-plugins.sh
+  wget -P /opt/app/inputs-templates https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/heat/teardown.sh
 
   pip install --upgrade jinja2
   wget https://${URL_ROOT}/${REPO_DEPLOYMENTS}/${RELEASE_TAG}/scripts/detemplate-bpinputs.py \
@@ -747,10 +802,16 @@ if [[ $DEPLOYMENT_PROFILE == R2* ]]; then
   echo "Waiting for CBS to come up ready"
   while ! nc -z localhost 10000; do sleep 1; done
   echo "All dependencies are up, proceed to the next phase"
-  sleep 5
+  sleep 30
 
   echo "Setup CloudifyManager and Registrator"
   ./setup.sh
+  sleep 10
+
+  export http_proxy=""
+  export https_proxy=""
+
+
   ./register.sh
 
   echo "Bring up DCAE MIN service components for R2 use cases"
@@ -801,6 +862,10 @@ docker run -d \
 -p ${HEALTHPORT}:80 \
 -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf" \
 -v "/tmp/healthcheck:/www/healthcheck" \
+--label "SERVICE_80_NAME=dcae-health" \
+--label "SERVICE_80_CHECK_HTTP=/healthcheck" \
+--label "SERVICE_80_CHECK_INTERVAL=15s" \
+--label "SERVICE_80_CHECK_INITIAL_STATUS=passing" \
  nginx
 
 echo "Healthcheck API available at http://${MYFLOATIP}:${HEALTHPORT}/healthcheck"
@@ -809,6 +874,7 @@ echo "                             http://${MYFLOATIP}:${HEALTHPORT}/R2MIN"
 echo "                             http://${MYFLOATIP}:${HEALTHPORT}/R2PLUS"
 
 # run forever for updating health status based on consul
+set +e
 while :
 do
   rm -rf /tmp/healthcheck/*
@@ -822,7 +888,8 @@ do
 
   SERVICES_JSON=$(echo "$SERVICES" | sed 's/\"$/\",/g' | sed '$ s/.$//')
 
-
+  echo "$(date): running healthy services:"
+  echo ">>> " $SERVICES
   PLT_CONSUL=$(echo "$SERVICES" |grep consul)
   PLT_CBS=$(echo "$SERVICES" |grep "config_binding_service")
   MVP_PG_HOLMES=$(echo "$SERVICES" |grep "pgHolmes")
@@ -844,21 +911,29 @@ do
   PLUS_TRAP=$(echo "$SERVICES" |grep "snmptrap")
 
   DATA="{\"healthy\" : \"$(date)\", \"healthy_services\": [${SERVICES_JSON}]}"
-  if [[ -n $PLT_CONSUL && -n $PLT_CBS && -n $MVP_PG_HOLMES && -n $MVP_VES && \
-        -n $MVP_TCA && -n $MVP_HR && -n $MVP_HE ]]; then
+  if [[ -n "$PLT_CONSUL" && -n "$PLT_CBS" && -n "$MVP_PG_HOLMES" && -n "$MVP_VES" && \
+        -n "$MVP_TCA" && -n "$MVP_HR" && -n "$MVP_HE" ]]; then
     echo "${DATA}" > /tmp/healthcheck/r2mvp_healthy.yaml
     echo "${DATA}" > /tmp/healthcheck/services.yaml
+    echo ">>>>>> enough services satisfying R2MIN service deployment"
+  else
+    echo ">>>>>> not enough services satisfying R2MIN service deployment"
   fi
 
-  if [[ -n $CONSUL && -n $CBS && -n $PLT_CM && -n $PLT_DH && \
-        -n $PLT_PH && -n $PLT_SCH && -n $PLT_INV && -n $PLT_PG_INVENTORY ]]; then
+  if [[ -n "$PLT_CONSUL" && -n "$PLT_CBS" && -n "$PLT_CM" && -n "$PLT_DH" && \
+        -n "$PLT_PH" && -n "$PLT_SCH" && -n "$PLT_INV" && -n "$PLT_PG_INVENTORY" ]]; then
+    echo ">>>>>> enough services satisfying R2 platform deployment"
     echo "${DATA}" > /tmp/healthcheck/r2_healthy.yaml
 
-    if [[ -n $PLUS_MHB && -n $PLUS_PRH && -n $PLUS_MPR && -n $PLUS_TRAP ]]; then
+    if [[ -n "$PLUS_MHB" && -n "$PLUS_PRH" && -n "$PLUS_MPR" && -n "$PLUS_TRAP" ]]; then
+      echo ">>>>>> enough services satisfying R2PLUS deployment"
       echo "${DATA}" > /tmp/healthcheck/r2plus_healthy.yaml
+    else
+      echo ">>>>>> not enough services satisfying R2PLUS service deployment"
     fi
+  else
+    echo ">>>>>> not enough services satisfying R2 platform or R2PLUS service deployment"
   fi
-
   sleep 60
 done