Merge "Refactor vCPE vBRG and vBNG image creation process"
authorMarco Platania <platania@research.att.com>
Wed, 8 Aug 2018 17:30:27 +0000 (17:30 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 8 Aug 2018 17:30:27 +0000 (17:30 +0000)
55 files changed:
boot/bind_zones
boot/bind_zones_onap
boot/db_simpledemo_onap_org
boot/db_simpledemo_openecomp_org
boot/dcae2_vm_init.sh
boot/esr_vm_init.sh
boot/imagetest.sh [deleted file]
boot/msb_vm_init.sh
boot/multiserv_all_serv.sh [moved from boot/openo_all_serv.sh with 100% similarity]
boot/mvim_vm_init.sh
boot/uui_vm_init.sh
boot/vfc_vm_init.sh
docker_upgrade_scripts/fabfile.py
heat/ONAP/cloud-config/aaf_install.sh
heat/ONAP/cloud-config/aaf_vm_init.sh [moved from boot/aaf_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/aai_install.sh
heat/ONAP/cloud-config/aai_vm_init.sh [moved from boot/aai_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/appc_install.sh
heat/ONAP/cloud-config/appc_vm_init.sh [moved from boot/appc_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/clamp_install.sh
heat/ONAP/cloud-config/clamp_vm_init.sh [moved from boot/clamp_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/dbcl_vm_init.sh [moved from boot/dbcl_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/dcae2_install.sh [changed mode: 0755->0644]
heat/ONAP/cloud-config/dns_install.sh
heat/ONAP/cloud-config/mr_install.sh
heat/ONAP/cloud-config/mr_vm_init.sh [moved from boot/mr_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/multiserv_install.sh [new file with mode: 0644]
heat/ONAP/cloud-config/music_install.sh
heat/ONAP/cloud-config/music_vm_init.sh [moved from boot/music_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/nbi_install.sh
heat/ONAP/cloud-config/nbi_vm_init.sh [moved from boot/nbi_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/oof_install.sh
heat/ONAP/cloud-config/oof_vm_init.sh [moved from boot/oof_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/openo_install.sh [deleted file]
heat/ONAP/cloud-config/policy_install.sh
heat/ONAP/cloud-config/policy_vm_init.sh [moved from boot/policy_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/portal_install.sh
heat/ONAP/cloud-config/portal_vm_init.sh [moved from boot/portal_vm_init.sh with 100% similarity, mode: 0644]
heat/ONAP/cloud-config/robot_install.sh
heat/ONAP/cloud-config/robot_vm_init.sh [moved from boot/robot_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/sdc_install.sh
heat/ONAP/cloud-config/sdc_vm_init.sh [moved from boot/sdc_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/sdc_wfd_vm_init.sh [moved from boot/sdc_wfd_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/sdnc_install.sh
heat/ONAP/cloud-config/sdnc_vm_init.sh [moved from boot/sdnc_vm_init.sh with 98% similarity]
heat/ONAP/cloud-config/serv.sh [moved from boot/serv.sh with 97% similarity]
heat/ONAP/cloud-config/sms_install.sh
heat/ONAP/cloud-config/sms_vm_init.sh [moved from boot/sms_vm_init.sh with 100% similarity]
heat/ONAP/cloud-config/so_install.sh
heat/ONAP/cloud-config/so_vm_init.sh [moved from boot/so_vm_init.sh with 98% similarity]
heat/ONAP/cloud-config/vid_install.sh
heat/ONAP/cloud-config/vid_vm_init.sh [moved from boot/vid_vm_init.sh with 100% similarity]
heat/ONAP/onap_openstack.env
heat/ONAP/onap_openstack.yaml
heat/ONAP/onap_openstack_template.env

index 168ed04..dd8a890 100644 (file)
@@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.openecomp.org. IN      A       sms_ip_addr
 
 vm1.mr.simpledemo.openecomp.org.       IN      A       mr_ip_addr
 
-vm1.openo.simpledemo.openecomp.org. IN  A   openo_ip_addr
+vm1.multiserv.simpledemo.openecomp.org. IN  A   multiserv_ip_addr
 
 vm1.music.simpledemo.openecomp.org. IN  A   music_ip_addr
 
@@ -141,13 +141,13 @@ sniro.api.simpledemo.openecomp.org.       IN      CNAME   vm1.robot.simpledemo.openecomp.org.
 aaf.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aaf.simpledemo.openecomp.org.
 aaf-sms.api.simpledemo.openecomp.org.  IN      CNAME   vm1.aaf-sms.simpledemo.openecomp.org.
 
-;OPEN-O
-msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
+;MultiService
+msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
 
 ;MUSIC
 music.api.simpledemo.openecomp.org.    IN      CNAME   vm1.music.simpledemo.openecomp.org.
index 2d6d5f2..a6b0275 100644 (file)
@@ -82,7 +82,7 @@ vm1.aaf-sms.simpledemo.onap.org.      IN      A       sms_ip_addr
 
 vm1.mr.simpledemo.onap.org.    IN      A       mr_ip_addr
 
-vm1.openo.simpledemo.onap.org. IN  A   openo_ip_addr
+vm1.multiserv.simpledemo.onap.org. IN  A   multiserv_ip_addr
 
 vm1.music.simpledemo.onap.org. IN  A   music_ip_addr
 
@@ -141,13 +141,13 @@ sniro.api.simpledemo.onap.org.    IN      CNAME   vm1.robot.simpledemo.onap.org.
 aaf.api.simpledemo.onap.org.   IN      CNAME   vm1.aaf.simpledemo.onap.org.
 aaf-sms.api.simpledemo.onap.org.       IN      CNAME   vm1.aaf-sms.simpledemo.onap.org.
 
-;OPEN-O
-msb.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.openo.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.openo.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-uui.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-esr.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
+;MultiService
+msb.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+uui.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+esr.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
 
 ;MUSIC
 music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
index 2bb5a33..add2cab 100644 (file)
@@ -82,7 +82,7 @@ vm1.clamp.simpledemo.onap.org.           IN      A       10.0.12.1
 c1.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
 c2.vm1.clamp.simpledemo.onap.org.        IN      A       10.0.12.1
 
-vm1.openo.simpledemo.onap.org. IN      A       10.0.14.1
+vm1.multiserv.simpledemo.onap.org.     IN      A       10.0.14.1
 
 vm1.music.simpledemo.onap.org. IN      A       10.0.15.1
 
@@ -109,7 +109,7 @@ sdc.api.simpledemo.onap.org.        IN      CNAME   vm1.sdc.simpledemo.onap.org.
 ;DCAE
 dcae.api.simpledemo.onap.org.  IN      CNAME   vm1.dcae.simpledemo.onap.org.
 
-;MSO
+;SO
 mso.api.simpledemo.onap.org.   IN      CNAME   vm1.mso.simpledemo.onap.org.
 so.api.simpledemo.onap.org.        IN  CNAME   vm1.mso.simpledemo.onap.org.
 
@@ -144,13 +144,13 @@ clamp.api.simpledemo.onap.org.    IN      CNAME   vm1.clamp.simpledemo.onap.org.
 aaf.api.simpledemo.onap.org.   IN      CNAME   vm1.aaf.simpledemo.onap.org.
 aaf-sms.api.simpledemo.onap.org.       IN      CNAME   vm1.aaf-sms.simpledemo.onap.org.
 
-;OPEN-O
-msb.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.openo.simpledemo.onap.org.
-vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.openo.simpledemo.onap.org.
-vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-uui.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
-esr.api.simpledemo.onap.org.   IN      CNAME   vm1.openo.simpledemo.onap.org.
+;MultiService
+msb.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+mvim.api.simpledemo.onap.org.  IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+vnfsdk.api.simpledemo.onap.org.        IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+vfc.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+uui.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
+esr.api.simpledemo.onap.org.   IN      CNAME   vm1.multiserv.simpledemo.onap.org.
 
 ;MUSIC
 music.api.simpledemo.onap.org. IN      CNAME   vm1.music.simpledemo.onap.org.
index 23409d1..dc9a43a 100644 (file)
@@ -81,7 +81,7 @@ vm1.clamp.simpledemo.openecomp.org.           IN      A       10.0.12.1
 c1.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
 c2.vm1.clamp.simpledemo.openecomp.org.        IN      A       10.0.12.1
 
-vm1.openo.simpledemo.openecomp.org.    IN      A       10.0.14.1
+vm1.multiserv.simpledemo.openecomp.org.        IN      A       10.0.14.1
 
 vm1.music.simpledemo.openecomp.org.    IN      A       10.0.15.1
 
@@ -108,7 +108,7 @@ sdc.api.simpledemo.openecomp.org.   IN      CNAME   vm1.sdc.simpledemo.openecomp.org.
 ;DCAE
 dcae.api.simpledemo.openecomp.org.     IN      CNAME   vm1.dcae.simpledemo.openecomp.org.
 
-;MSO
+;SO
 mso.api.simpledemo.openecomp.org.      IN      CNAME   vm1.mso.simpledemo.openecomp.org.
 so.api.simpledemo.openecomp.org.       IN      CNAME   vm1.mso.simpledemo.openecomp.org.
 
@@ -142,13 +142,13 @@ clamp.api.simpledemo.openecomp.org.       IN      CNAME   vm1.clamp.simpledemo.openecomp.org.
 ;AAF
 aaf.api.simpledemo.openecomp.org.      IN      CNAME   vm1.aaf.simpledemo.openecomp.org.
 
-;OPEN-O
-msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
-esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.openo.simpledemo.openecomp.org.
+;MultiService
+msb.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+mvim.api.simpledemo.openecomp.org.     IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vnfsdk.api.simpledemo.openecomp.org.   IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+vfc.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+uui.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
+esr.api.simpledemo.openecomp.org.      IN      CNAME   vm1.multiserv.simpledemo.openecomp.org.
 
 ;MUSIC
 music.api.simpledemo.openecomp.org.    IN      CNAME   vm1.music.simpledemo.openecomp.org.
index 350e95b..9a5b59b 100755 (executable)
@@ -166,7 +166,7 @@ wait_for_multicloud_ready()
        
     # wait till MultiCloud up and ready
     local MCHOST
-    MCHOST=$(cat /opt/config/openo_ip_addr.txt)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     local MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
     local MCMETHOD='-X GET'
     local MCRESP='200'
@@ -195,7 +195,7 @@ 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)"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
     CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
 
     local RESPCODE
@@ -277,7 +277,7 @@ 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)"
+    MCIP="$(cat /opt/config/multiserv_ip_addr.txt)"
     CLOUD_IDENTITY_URL="http://${MCIP}/api/multicloud-titanium_cloud/v0/${CLOUD_OWNER}_${CLOUD_REGION}/identity/v2.0"
     KEYSTONE_URL="$(cat /opt/config/openstack_keystone_url.txt)"
     if [[ "$KEYSTONE_URL" == */v3 ]]; then
@@ -405,7 +405,7 @@ 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)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     MCDATA='-d "{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
@@ -578,7 +578,7 @@ 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)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     local DCAE_DOMAIN
@@ -623,7 +623,7 @@ 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)
+    MCHOST=$(cat /opt/config/multiserv_ip_addr.txt)
     MCURL="http://$MCHOST:9005/api/multicloud-titanium_cloud/v0/swagger.json"
 
     MCDATA='"{\"auth\":{\"tenantName\": \"'${DNSAAS_TENANT_NAME}'\"}}"'
index 460061f..2664905 100644 (file)
@@ -15,5 +15,5 @@ docker pull $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
 docker rm -f esr_server
 docker rm -f esr_gui
 
-docker run -i -t -d -p 9518:9518 -e MSB_ADDR=$OPENO_IP:443 --name esr_server $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION
-docker run -i -t -d -p 9519:8080 -e MSB_ADDR=$OPENO_IP:443 --name esr_gui $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
\ No newline at end of file
+docker run -i -t -d -p 9518:9518 -e MSB_ADDR=$MULTISERV_IP:443 --name esr_server $NEXUS_DOCKER_REPO/onap/aai/esr-server:$DOCKER_IMAGE_VERSION
+docker run -i -t -d -p 9519:8080 -e MSB_ADDR=$MULTISERV_IP:443 --name esr_gui $NEXUS_DOCKER_REPO/onap/aai/esr-gui:$DOCKER_IMAGE_VERSION
\ No newline at end of file
diff --git a/boot/imagetest.sh b/boot/imagetest.sh
deleted file mode 100644 (file)
index edd6154..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
-HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
-
-image=$(cat /etc/issue | cut -d' ' -f2 | cut -c1-5)
-echo $image
-if [ ${image} == '16.04' ]
-then
-    echo "[Service]" > /etc/systemd/system/docker.service.d/http-proxy.conf
-    echo "Environment=\"http_proxy=http://\"$HTTP_PROXY\"" >> /etc/systemd/system/docker.service.d/http-proxy.conf
-    echo "Environment=\"https_proxy=https://\"$HTTPS_PROXY\"" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-    echo "Environment=\"HTTP_PROXY=HTTP://\"$HTTP_PROXY\"" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-    echo "Environment=\"HTTPS_PROXY=HTTPS://\"$HTTPS_PROXY\"" >>/etc/systemd/system/docker.service.d/http-proxy.conf
-elif [ ${image} == '14.04' ]
-then
-    echo " export http_proxy=$HTTP_PROXY " > /etc/default/docker
-    echo " export https_proxy=$HTTPS_PROXY " >> /etc/default/docker
-else echo " It's not a 16 nor a 14 Ubuntu image"
-fi
index 938a3d6..c43b1e8 100644 (file)
@@ -30,167 +30,167 @@ sleep 20
 # register ONAP services to MSB
 #aai
 #cloud-infrastructure
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","path": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","path": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v11", "url": "/aai/v11/cloud-infrastructure","path": "/aai/v11/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v12", "url": "/aai/v12/cloud-infrastructure","path": "/aai/v12/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-cloudInfrastructure", "version": "v13", "url": "/aai/v13/cloud-infrastructure","path": "/aai/v13/cloud-infrastructure","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #business
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v12", "url": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v13", "url": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v11", "url": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v12", "url": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-business", "version": "v13", "url": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v12", "url": "/aai/v12/business","path": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v13", "url": "/aai/v13/business","path": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v11", "url": "/aai/v11/business","path": "/aai/v11/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v12", "url": "/aai/v12/business","path": "/aai/v12/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-business", "version": "v13", "url": "/aai/v13/business","path": "/aai/v13/business","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #actions
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v12", "url": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v13", "url": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v11", "url": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v12", "url": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-actions", "version": "v13", "url": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v12", "url": "/aai/v12/actions","path": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v13", "url": "/aai/v13/actions","path": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v11", "url": "/aai/v11/actions","path": "/aai/v11/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v12", "url": "/aai/v12/actions","path": "/aai/v12/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-actions", "version": "v13", "url": "/aai/v13/actions","path": "/aai/v13/actions","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #service-design-and-creation
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","path": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","path": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v11", "url": "/aai/v11/service-design-and-creation","path": "/aai/v11/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v12", "url": "/aai/v12/service-design-and-creation","path": "/aai/v12/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-service-design-and-creation", "version": "v13", "url": "/aai/v13/service-design-and-creation","path": "/aai/v13/service-design-and-creation","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #network
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v12", "url": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v13", "url": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v11", "url": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v12", "url": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-network", "version": "v13", "url": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v12", "url": "/aai/v12/network","path": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v13", "url": "/aai/v13/network","path": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v11", "url": "/aai/v11/network","path": "/aai/v11/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v12", "url": "/aai/v12/network","path": "/aai/v12/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-network", "version": "v13", "url": "/aai/v13/network","path": "/aai/v13/network","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #externalSystem
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","path": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","path": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v11", "url": "/aai/v11/external-system","path": "/aai/v11/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v12", "url": "/aai/v12/external-system","path": "/aai/v12/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-externalSystem", "version": "v13", "url": "/aai/v13/external-system","path": "/aai/v13/external-system","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8447"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #traversal
 #generic-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","path": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","path": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","path": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v11", "url": "/aai/v11/generic-query","path": "/aai/v11/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v12", "url": "/aai/v12/generic-query","path": "/aai/v12/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-generic-query", "version": "v13", "url": "/aai/v13/generic-query","path": "/aai/v13/generic-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #nodes-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","path": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","path": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","path": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v11", "url": "/aai/v11/nodes-query","path": "/aai/v11/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v12", "url": "/aai/v12/nodes-query","path": "/aai/v12/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-nodes-query", "version": "v13", "url": "/aai/v13/nodes-query","path": "/aai/v13/nodes-query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v11", "url": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v12", "url": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v13", "url": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v11", "url": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v12", "url": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-query", "version": "v13", "url": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v11", "url": "/aai/v11/query","path": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v12", "url": "/aai/v12/query","path": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v13", "url": "/aai/v13/query","path": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v11", "url": "/aai/v11/query","path": "/aai/v11/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v12", "url": "/aai/v12/query","path": "/aai/v12/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-query", "version": "v13", "url": "/aai/v13/query","path": "/aai/v13/query","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #named-query
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-named-query", "url": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-named-query", "url": "/aai/search","path": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-named-query", "url": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "_aai-named-query", "url": "/aai/search","path": "/aai/search","protocol": "REST", "enable_ssl":"true", "lb_policy":"ip_hash", "nodes": [ {"ip": "'$AAI_IP1'","port": "8446"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 #search
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"True", "lb_policy":"round-robin","nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-search", "version": "v11", "url": "/aai/v11/search","protocol": "REST", "enable_ssl":"True", "lb_policy":"round-robin","nodes": [ {"ip": "'$AAI_IP1'","port": "8443"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 
 # esr (not deployed together with AAI
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true",  "visualRange":"1", "nodes": [ {"ip": "'$OPENO_IP'","port": "9518"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-server", "version": "v1", "url": "/api/aai-esr-server/v1","protocol": "REST", "enable_ssl":"true",  "visualRange":"1", "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9518"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI",  "nodes": [ {"ip": "'$OPENO_IP'","port": "9519"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "aai-esr-gui", "version": "v1", "url": "/esr-gui","path": "/iui/aai-esr-gui","protocol": "UI",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9519"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #so
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so", "version": "v1", "url": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "so-deprecated", "version": "v1", "url": "/ecomp/mso/infra","path": "/ecomp/mso/infra","protocol": "REST",  "nodes": [ {"ip": "'$SO_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #Dmaap message router
-#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+#curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "message-router", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$DMAAP_IP'","port": "3904"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #policy
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp", "version": "v1", "url": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "policy-pdp-deprecated", "version": "v1", "url": "/pdp","path": "/pdp","protocol": "REST",  "nodes": [ {"ip": "'$POLICY_IP'","port": "8081"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #portal
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "portal", "version": "v2", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$PORTAL_IP'","port": "8989"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #sdc
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc", "version": "v1", "url": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdc-deprecated", "version": "v1", "url": "/sdc/v1","path": "/sdc/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #sdnc
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc", "version": "v1", "url": "/","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "sdnc-compatible", "version": "v1", "url": "/restconf","path": "/restconf","protocol": "REST",  "nodes": [ {"ip": "'$SDNC_IP'","port": "8282"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #multi-vim
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "9001"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud", "version": "v0", "url": "/api/multicloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9001"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "9004"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-vio", "version": "v0", "url": "/api/multicloud-vio/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9004"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "9006"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-ocata", "version": "v0", "url": "/api/multicloud-ocata/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9006"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "9005"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multicloud-titanium_cloud", "version": "v0", "url": "/api/multicloud-titanium_cloud/v0","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "9005"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #VF-C
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8403"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nslcm", "version": "v1", "url": "/api/nslcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8403"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8410"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztevnfmdriver", "version": "v1", "url": "/api/ztevnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8410"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8411"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "ztesdncdriver", "version": "v1", "url": "/api/ztesdncdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8411"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8480"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "resmgr", "version": "v1", "url": "/api/resmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8480"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8484"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "gvnfmdriver", "version": "v1", "url": "/api/gvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8484"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8482"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "huaweivnfmdriver", "version": "v1", "url": "/api/huaweivnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8482"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8485"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "nokiavnfmdriver", "version": "v1", "url": "/api/nokiavnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8485"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8483"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "jujuvnfmdriver", "version": "v1", "url": "/api/jujuvnfmdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8483"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multivimproxy", "version": "v1", "url": "/api/multivimproxy/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8481"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "multivimproxy", "version": "v1", "url": "/api/multivimproxy/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8481"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8801"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnflcm", "version": "v1", "url": "/api/vnflcm/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8801"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8802"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfres", "version": "v1", "url": "/api/vnfres/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8802"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8803"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "vnfmgr", "version": "v1", "url": "/api/vnfmgr/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8803"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/activiti-rest", "path": "/activiti-rest" "protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8804"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "activiti", "version": "v1", "url": "/activiti-rest", "path": "/activiti-rest" "protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8804"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8805"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow", "version": "v1", "url": "/api/workflow/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8805"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler", "version": "v1", "url": "/api/workflow-modeler/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler-ui", "version": "v1", "url": "/workflow-modeler","path": "/workflow-modeler","protocol": "UI",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler", "version": "v1", "url": "/api/workflow-modeler/v1","protocol": "REST",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "workflow-modeler-ui", "version": "v1", "url": "/workflow-modeler","path": "/workflow-modeler","protocol": "UI",  "nodes": [ {"ip": "'$SDC_IP'","port": "9527"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8806"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "catalog", "version": "v1", "url": "/api/catalog/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8806"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "NokiaSVNFM", "version": "v1", "url": "/api/NokiaSVNFM/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8089"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "NokiaSVNFM", "version": "v1", "url": "/api/NokiaSVNFM/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8089"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8206"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "emsdriver", "version": "v1", "url": "/api/emsdriver/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8206"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 #UUI
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8082"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-server", "version": "v1", "url": "/api/usecaseui/server/v1","protocol": "REST",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8082"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI",  "nodes": [ {"ip": "'$OPENO_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "usecaseui-ui", "version": "v1", "url": "/usecase-ui","path": "/iui/usecaseui","protocol": "UI",  "nodes": [ {"ip": "'$MULTISERV_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
 
 # CLAMP
-curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "clamp", "version": "v1", "url": "/restservices/clds/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$CLAMP_IP'","port": "8080"}]}' "http://$OPENO_IP:10081/api/microservices/v1/services"
+curl -X POST -H "Content-Type: application/json" -d '{"serviceName": "clamp", "version": "v1", "url": "/restservices/clds/v1","protocol": "REST", "visualRange":"1", "nodes": [ {"ip": "'$CLAMP_IP'","port": "8080"}]}' "http://$MULTISERV_IP:10081/api/microservices/v1/services"
index 0408d1b..79ae0ad 100755 (executable)
@@ -21,7 +21,7 @@ docker rm -f multicloud-vio
 docker rm -f multicloud-ocata
 docker rm -f multicloud-windriver
 
-docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
-docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -e MR_ADDR=$MR_IP -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
-docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9006:9006 --name multicloud-ocata $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
-docker run -d -t -e MSB_ADDR=$OPENO_IP -e AAI_ADDR=$AAI_IP1 -p 9005:9005 --name multicloud-windriver $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION
+docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9001:9001 --name multicloud-broker $NEXUS_DOCKER_REPO/onap/multicloud/framework:$DOCKER_IMAGE_VERSION
+docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -e MR_ADDR=$MR_IP -p 9004:9004 --name multicloud-vio $NEXUS_DOCKER_REPO/onap/multicloud/vio:$DOCKER_IMAGE_VERSION
+docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9006:9006 --name multicloud-ocata $NEXUS_DOCKER_REPO/onap/multicloud/openstack-ocata:$DOCKER_IMAGE_OPENSTACK_VERSION
+docker run -d -t -e MSB_ADDR=$MULTISERV_IP -e AAI_ADDR=$AAI_IP1 -p 9005:9005 --name multicloud-windriver $NEXUS_DOCKER_REPO/onap/multicloud/openstack-windriver:$DOCKER_IMAGE_OPENSTACK_VERSION
index 01cee5f..46a8edf 100755 (executable)
@@ -17,5 +17,5 @@ docker rm -f uui_ui
 docker rm -f uui_server
 
 # Insert docker run instructions here
-docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$OPENO_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
-docker run -i -t -d --name uui_server -p 8082:8082 -e MSB_ADDR=$OPENO_IP:80 -e MR_ADDR=$MR_IP:3904 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file
+docker run -i -t -d --name uui_ui -p 8080:8080 -e MSB_ADDR=$MULTISERV_IP:80 $NEXUS_DOCKER_REPO/onap/usecase-ui:$DOCKER_IMAGE_VERSION
+docker run -i -t -d --name uui_server -p 8082:8082 -e MSB_ADDR=$MULTISERV_IP:80 -e MR_ADDR=$MR_IP:3904 $NEXUS_DOCKER_REPO/onap/usecase-ui/usecase-ui-server:$DOCKER_IMAGE_VERSION
\ No newline at end of file
index e328fd8..6252489 100755 (executable)
@@ -47,22 +47,22 @@ docker rm -f vfc_svnfm_nokia
 docker rm -f vfc_svnfm_nokiav2
 
 # Insert docker run instructions here
-docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
-docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$OPENO_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$OPENO_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
-docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
-docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
-docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
-docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
-docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
-docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
-docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
-docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
-docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$OPENO_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
-docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MSB_IP:80 -e SERVICE_IP=$OPENO_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
+docker run -i -t -d --name vfc_wfengine_activiti -p 8804:8080 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8804 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-activiti:$ACTIVITI_DOCKER_VER
+docker run -i -t -d --name vfc_wfengine_mgrservice -p 8805:10550 -e SERVICE_IP=$MULTISERV_IP -e SERVICE_PORT=8805 -e OPENPALETTE_MSB_IP=$MULTISERV_IP -e OPENPALETTE_MSB_PORT=80 $NEXUS_DOCKER_REPO/onap/vfc/wfengine-mgrservice:$MGRSERVICE_DOCKER_VER
+docker run -i -t -d --name vfc_catalog -p 8806:8806 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/catalog:$CATALOG_DOCKER_VER
+docker run -i -t -d --name vfc_emsdriver -p 8206:8206 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP -e VES_ADDR=$DCAE_COLL_IP:8080 -e VES_AUTHINFO="":"" $NEXUS_DOCKER_REPO/onap/vfc/emsdriver:$EMSDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_gvnfmdriver -p 8484:8484 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/gvnfmdriver:$GVNFMDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_jujudriver -p 8483:8483 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/jujudriver:$JUJUDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_huawei -p 8482:8482 -p 8443:8443 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/huawei:$HUAWEI_DOCKER_VER
+docker run -i -t -d --name vfc_nslcm -p 8403:8403 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nslcm:$NSLCM_DOCKER_VER
+docker run -i -t -d --name vfc_resmanagement -p 8480:8480 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/resmanagement:$RESMANAGEMENT_DOCKER_VER
+docker run -i -t -d --name vfc_vnflcm -p 8801:8801 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnflcm:$VNFLCM_DOCKER_VER
+docker run -i -t -d --name vfc_vnfmgr -p 8803:8803 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfmgr:$VNFMGR_DOCKER_VER
+docker run -i -t -d --name vfc_vnfres -p 8802:8802 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/vnfres:$VNFRES_DOCKER_VER
+docker run -i -t -d --name vfc_ztesdncdriver -p 8411:8411 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztesdncdriver:$ZTESDNCDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_ztevnfmdriver -p 8410:8410 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/ztevnfmdriver:$ZTEVNFMDRIVER_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_nokia -p 8486:8486 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokia:$NOKIA_DOCKER_VER
+docker run -i -t -d --name vfc_multivimproxy -p 8481:8481 -e MSB_ADDR=$MULTISERV_IP:80 -e SERVICE_IP=$MULTISERV_IP $NEXUS_DOCKER_REPO/onap/vfc/multivimproxy:$MULTIVIMPROXY_DOCKER_VER
 
 VNFM_ID=vnfmUuid
-docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$OPENO_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$OPENO_IP -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
+docker run -i -t -d --name vfc_svnfm_nokiav2 -p 8089:8089 -e MSB_IP=$MULTISERV_IP -e CONFIGURE=kuku -e EXTERNAL_IP=$MULTISERV_IP -e "VNFM_ID=$VNFM_ID" -d --stop-timeout 300 $NEXUS_DOCKER_REPO/onap/vfc/nfvo/svnfm/nokiav2:$NOKIAV2_DOCKER_VER
index 72e3e61..f4c5726 100755 (executable)
@@ -14,8 +14,8 @@ def upgrade_docker(server_name, my_env):
                execute_file = "/opt/mr_vm_init.sh"
        elif server_name in "dcae-controller":
                execute_file = "/opt/dcae2_vm_init.sh"
-       elif server_name in "openo-server":
-               execute_file = "/opt/openo_all_serv.sh" 
+       elif server_name in "multiserv-server":
+               execute_file = "/opt/multiserv_all_serv.sh" 
        elif server_name in "dns":
                execute_file = None
        else:
index 171592c..2d6657e 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -17,67 +13,11 @@ then
 fi
 
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
 # Download dependencies
 echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
 echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >>  /etc/apt/sources.list.d/java.list
 apt-get update
-apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make maven
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aaf_vm_init.sh > /opt/aaf_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/aaf_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/aaf_vm_init.sh
-chmod +x /opt/aaf_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./aaf_vm_init.sh\"|g" /opt/aaf_serv.sh
-mv /opt/aaf_serv.sh /etc/init.d
-update-rc.d aaf_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
+apt-get install --allow-unauthenticated -y openjdk-8-jdk maven
 
 # Clone Gerrit repository and run docker containers
 cd /opt
index b238fd6..774b45a 100644 (file)
@@ -1,12 +1,8 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
 AAI_INSTANCE=$(cat /opt/config/aai_instance.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -17,66 +13,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aai_vm_init.sh > /opt/aai_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/aai_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/aai_vm_init.sh
-chmod +x /opt/aai_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./aai_vm_init.sh\"|g" /opt/aai_serv.sh
-mv /opt/aai_serv.sh /etc/init.d
-update-rc.d aai_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
index e871bfc..8c680ee 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip appc_vm_init.sh > /opt/appc_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/appc_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/appc_vm_init.sh
-chmod +x /opt/appc_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./appc_vm_init.sh\"|g" /opt/appc_serv.sh
-mv /opt/appc_serv.sh /etc/init.d
-update-rc.d appc_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO appc
index ffe4d14..653be90 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_vm_init.sh > /opt/clamp_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/clamp_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/clamp_vm_init.sh
-chmod +x /opt/clamp_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./clamp_vm_init.sh\"|g" /opt/clamp_serv.sh
-mv /opt/clamp_serv.sh /etc/init.d
-update-rc.d clamp_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
old mode 100755 (executable)
new mode 100644 (file)
index d0f5fd6..fbc8db3
@@ -19,9 +19,6 @@
 set -ex 
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 EXTERNAL_DNS=$(cat /opt/config/external_dns.txt)
 MAC_ADDR=$(cat /opt/config/mac_addr.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
@@ -33,65 +30,17 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       # Add host name to /etc/host to avoid warnings in openstack images
-       echo "127.0.0.1 $(hostname)" >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
 
 # Download dependencies
 apt-get update
-#apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate python python-pip
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip
+apt-get install -y python python-pip
 
 # Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_vm_init.sh > /opt/dcae2_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/dcae2_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
+cp /opt/boot/dcae2_vm_init.sh /opt/dcae2_vm_init.sh
 chmod +x /opt/dcae2_vm_init.sh
-chmod +x /opt/dcae2_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./dcae2_vm_init.sh\"|g" /opt/dcae2_serv.sh
-mv /opt/dcae2_serv.sh /etc/init.d
-update-rc.d dcae2_serv.sh defaults
 
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y "linux-image-extra-$(uname -r)" linux-image-extra-virtual jq
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir -p /opt/docker
-curl -L "https://github.com/docker/compose/releases/download/1.9.0/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may 
-# need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
+echo "DOCKER_OPTS=\"\$DOCKER_OPTS --raw-logs -H tcp://0.0.0.0:2376 -H unix:///var/run/docker.sock\"" >> /etc/default/docker
 sed -i "/ExecStart/s/$/ -H tcp:\/\/0.0.0.0:2376 --raw-logs/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
 systemctl daemon-reload
 service docker restart
 
@@ -99,10 +48,6 @@ service docker restart
 echo "$(cat /opt/config/dcae_ip_addr.txt) consul" >>/etc/hosts
 echo "$(cat /opt/config/dcae_ip_addr.txt) dockerhost" >>/etc/hosts
 
-# DNS IP address configuration
-echo "nameserver $DNS_IP_ADDR" >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # prepare the configurations needed by DCAEGEN2 installer
 rm -rf /opt/app/config
 mkdir -p /opt/app/config
index 1f940ac..ca6f560 100644 (file)
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -15,33 +14,24 @@ fi
 
 if [[ $CLOUD_ENV != "rackspace" ]]
 then
-       # Add host name to /etc/host to avoid warnings in openstack images
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-
-       # Set the Bind configuration file name based on the deployment environment
-       ZONE_FILE="bind_zones"
-       ZONE_ONAP="bind_zones_onap"
-       OPTIONS_FILE="bind_options"
+       # Set the Bind configuration file name based on the deployment environment
+       ZONE_FILE="bind_zones"
+       ZONE_ONAP="bind_zones_onap"
+       OPTIONS_FILE="bind_options"
 else
-       ZONE_FILE="db_simpledemo_openecomp_org"
-       ZONE_ONAP="db_simpledemo_onap_org"
-       OPTIONS_FILE="named.conf.options"
+       ZONE_FILE="db_simpledemo_openecomp_org"
+       ZONE_ONAP="db_simpledemo_onap_org"
+       OPTIONS_FILE="named.conf.options"
 fi
 
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget bind9 bind9utils bind9-doc ntp ntpdate make
+apt-get install -y bind9 bind9utils bind9-doc
 
 # Download script
 mkdir /etc/bind/zones
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $ZONE_FILE > /etc/bind/zones/db.simpledemo.openecomp.org
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $ZONE_ONAP > /etc/bind/zones/db.simpledemo.onap.org
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip $OPTIONS_FILE > /etc/bind/named.conf.options
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip named.conf.local > /etc/bind/named.conf.local
+cp /opt/boot/$ZONE_FILE /etc/bind/zones/db.simpledemo.openecomp.org
+cp /opt/boot/$ZONE_ONAP /etc/bind/zones/db.simpledemo.onap.org
+cp /opt/boot/$OPTIONS_FILE /etc/bind/named.conf.options
+cp /opt/boot/named.conf.local /etc/bind/named.conf.local
 
 # Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments
 if [[ $CLOUD_ENV != "rackspace" ]]
@@ -63,7 +53,7 @@ then
        sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-       sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+       sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
        sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
@@ -84,7 +74,7 @@ then
        sed -i "s/sdnc_ip_addr/"$(cat /opt/config/sdnc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/vid_ip_addr/"$(cat /opt/config/vid_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/clamp_ip_addr/"$(cat /opt/config/clamp_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
-       sed -i "s/openo_ip_addr/"$(cat /opt/config/openo_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+       sed -i "s/multiserv_ip_addr/"$(cat /opt/config/multiserv_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/music_ip_addr/"$(cat /opt/config/music_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/oof_ip_addr/"$(cat /opt/config/oof_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
        sed -i "s/aaf_ip_addr/"$(cat /opt/config/aaf_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
index b757358..be49b97 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,71 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate
-
-# Download scripts from Nexus
-# a) scripts for message router (mr)
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mr_vm_init.sh > /opt/mr_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/mr_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/mr_vm_init.sh
-chmod +x /opt/mr_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./mr_vm_init.sh\"|g" /opt/mr_serv.sh
-mv /opt/mr_serv.sh /etc/init.d
-update-rc.d mr_serv.sh defaults
-
-# b) scripts for bus controller (dbcl)
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dbcl_vm_init.sh > /opt/dbcl_vm_init.sh
-chmod +x /opt/dbcl_vm_init.sh
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO /opt/startup-vm-message-router
diff --git a/heat/ONAP/cloud-config/multiserv_install.sh b/heat/ONAP/cloud-config/multiserv_install.sh
new file mode 100644 (file)
index 0000000..0487172
--- /dev/null
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Read configuration files
+VNFSDK_BRANCH=$(cat /opt/config/vnfsdk_branch.txt)
+VNFSDK_REPO=$(cat /opt/config/vnfsdk_repo.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
+
+# Download dependencies
+apt-get update
+apt-get install -y mysql-client-core-5.6
+
+# Download scripts from Nexus
+cp /opt/boot/vnfsdk_vm_init.sh /opt/vnfsdk_vm_init.sh
+cp /opt/boot/msb_vm_init.sh /opt/msb_vm_init.sh
+cp /opt/boot/mvim_vm_init.sh /opt/mvim_vm_init.sh
+cp /opt/boot/vfc_vm_init.sh /opt/vfc_vm_init.sh
+cp /opt/boot/uui_vm_init.sh /opt/uui_vm_init.sh
+cp /opt/boot/multiserv_all_serv.sh /opt/multiserv_all_serv.sh
+cp /opt/boot/esr_vm_init.sh /opt/esr_vm_init.sh
+chmod +x /opt/vnfsdk_vm_init.sh
+chmod +x /opt/msb_vm_init.sh
+chmod +x /opt/mvim_vm_init.sh
+chmod +x /opt/vfc_vm_init.sh
+chmod +x /opt/uui_vm_init.sh
+chmod +x /opt/multiserv_all_serv.sh
+chmod +x /opt/esr_vm_init.sh
+
+# Clone Gerrit repository and run docker containers
+cd /opt
+git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_REPO
+source ./cli_install.sh
+./multiserv_all_serv.sh
index 84ba562..42cc01a 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_vm_init.sh > /opt/music_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/music_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/music_vm_init.sh
-chmod +x /opt/music_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./music_vm_init.sh\"|g" /opt/music_serv.sh
-mv /opt/music_serv.sh /etc/init.d
-update-rc.d music_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
index 7705a25..d7fce0f 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,68 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-apt-get update
-apt-get install -y apt-transport-https ca-certificates curl git ntp ntpdate make software-properties-common
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_vm_init.sh > /opt/nbi_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/nbi_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/nbi_vm_init.sh
-chmod +x /opt/nbi_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./nbi_vm_init.sh\"|g" /opt/nbi_serv.sh
-mv /opt/nbi_serv.sh /etc/init.d
-update-rc.d nbi_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-add-apt-repository \
-   "deb [arch=amd64] https://download.docker.com/linux/ubuntu \
-   $(lsb_release -cs) \
-   stable"
-apt-get update
-apt-get install -y docker-ce
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Run docker containers
 cd /opt
 ./nbi_vm_init.sh
index d8eda1d..c86aad8 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip oof_vm_init.sh > /opt/oof_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/oof_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/oof_vm_init.sh
-chmod +x /opt/oof_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./oof_vm_init.sh\"|g" /opt/oof_serv.sh
-mv /opt/oof_serv.sh /etc/init.d
-update-rc.d oof_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO optf-has
diff --git a/heat/ONAP/cloud-config/openo_install.sh b/heat/ONAP/cloud-config/openo_install.sh
deleted file mode 100644 (file)
index 57e0094..0000000
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-# Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-VNFSDK_BRANCH=$(cat /opt/config/vnfsdk_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-VNFSDK_REPO=$(cat /opt/config/vnfsdk_repo.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
-
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-    echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-    # Allow remote login as root
-    mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-    cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git unzip mysql-client-core-5.6 ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vnfsdk_vm_init.sh > /opt/vnfsdk_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip msb_vm_init.sh > /opt/msb_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip mvim_vm_init.sh > /opt/mvim_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vfc_vm_init.sh > /opt/vfc_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip uui_vm_init.sh > /opt/uui_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip openo_all_serv.sh > /opt/openo_all_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/openo_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip cli_install.sh > /opt/cli_install.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip esr_vm_init.sh > /opt/esr_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/vnfsdk_vm_init.sh
-chmod +x /opt/msb_vm_init.sh
-chmod +x /opt/mvim_vm_init.sh
-chmod +x /opt/vfc_vm_init.sh
-chmod +x /opt/uui_vm_init.sh
-chmod +x /opt/openo_all_serv.sh
-chmod +x /opt/openo_serv.sh
-chmod +x /opt/cli_install.sh
-chmod +x /opt/esr_vm_init.sh
-sed -i "s|cmd=\"\"|cmd=\"./openo_all_serv.sh\"|g" /opt/openo_serv.sh
-mv /opt/openo_serv.sh /etc/init.d
-update-rc.d openo_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-    DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-    DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
-# Clone Gerrit repository and run docker containers
-cd /opt
-git clone -b $VNFSDK_BRANCH --single-branch $VNFSDK_REPO
-source ./cli_install.sh
-./openo_all_serv.sh
\ No newline at end of file
index c77323d..362b582 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip policy_vm_init.sh > /opt/policy_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/policy_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/policy_vm_init.sh
-chmod +x /opt/policy_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./policy_vm_init.sh\"|g" /opt/policy_serv.sh
-mv /opt/policy_serv.sh /etc/init.d
-update-rc.d policy_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO policy
index d052d65..3bd9eeb 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git unzip mysql-client-core-5.6 ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_vm_init.sh > /opt/portal_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/portal_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/portal_vm_init.sh
-chmod +x /opt/portal_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./portal_vm_init.sh\"|g" /opt/portal_serv.sh
-mv /opt/portal_serv.sh /etc/init.d
-update-rc.d portal_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from boot/portal_vm_init.sh
rename to heat/ONAP/cloud-config/portal_vm_init.sh
index 7896ecd..90e7251 100644 (file)
@@ -1,10 +1,6 @@
 #!/bin/bash -x
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
 
@@ -17,73 +13,19 @@ fi
 # Short-term fix to get around MSO to SO name change
 cp /opt/config/so_ip_addr.txt /opt/config/mso_ip_addr.txt
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
 
 # Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot_vm_init.sh > /opt/robot_vm_init.sh
-chmod +x /opt/robot_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/robot_serv.sh
-chmod +x /opt/robot_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./robot_vm_init.sh\"|g" /opt/robot_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-
 mkdir -p /opt/eteshare/config
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/integration_preload_parameters.py > /opt/eteshare/config/integration_preload_parameters.py
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/integration_robot_properties.py > /opt/eteshare/config/integration_robot_properties.py
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/vm_config2robot.sh > /opt/eteshare/config/vm_config2robot.sh
+cp /opt/boot/robot/integration_preload_parameters.py /opt/eteshare/config/integration_preload_parameters.py
+cp /opt/boot/robot/integration_robot_properties.py /opt/eteshare/config/integration_robot_properties.py
+cp /opt/boot/robot/vm_config2robot.sh /opt/eteshare/config/vm_config2robot.sh
 chmod +x /opt/eteshare/config/vm_config2robot.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/ete.sh > /opt/ete.sh
+cp /opt/boot/robot/ete.sh /opt/ete.sh
 chmod +x /opt/ete.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip robot/demo.sh > /opt/demo.sh
+cp /opt/boot/robot/demo.sh /opt/demo.sh
 chmod +x /opt/demo.sh
 
 mkdir -p /opt/eteshare/logs
 
-cp /opt/robot_serv.sh /etc/init.d
-update-rc.d robot_serv.sh defaults
-
-# Download and install docker-engine
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Run docker containers.
 ./robot_vm_init.sh
index 5596373..caeff2f 100644 (file)
@@ -1,11 +1,8 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
 CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,50 +13,15 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_vm_init.sh > /opt/sdc_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/sdc_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_wfd_vm_init.sh > /opt/sdc_wfd_vm_init.sh
-chmod +x /opt/sdc_vm_init.sh
-chmod +x /opt/sdc_serv.sh
-chmod +x /opt/sdc_wfd_vm_init.sh
-sed -i "s|cmd=\"\"|cmd=\"./sdc_vm_init.sh\"|g" /opt/sdc_serv.sh
-mv /opt/sdc_serv.sh /etc/init.d
-update-rc.d sdc_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
 # Create partition and mount the external volume
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_ext_volume_partitions.txt > /opt/sdc_ext_volume_partitions.txt
+cp /opt/boot/sdc_ext_volume_partitions.txt /opt/sdc_ext_volume_partitions.txt
 
 if [[ $CLOUD_ENV == "rackspace" ]]
 then
-       DISK="xvdb"
+       DISK="xvdb"
 else
-       DISK=$(ls /dev |grep -e '^.*db$')
-       sed -i "s/xvdb/$DISK/g" /opt/sdc_ext_volume_partitions.txt
+       DISK=$(ls /dev |grep -e '^.*db$')
+       sed -i "s/xvdb/$DISK/g" /opt/sdc_ext_volume_partitions.txt
 fi
 
 sfdisk /dev/$DISK < /opt/sdc_ext_volume_partitions.txt
@@ -68,30 +30,6 @@ mkdir -p /data
 mount /dev/$DISK"1" /data
 echo "/dev/"$DISK"1  /data           ext4    errors=remount-ro,noatime,barrier=0 0       1" >> /etc/fstab
 
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
 
 # Clone Gerrit repository
 cd /opt
index 2c82eea..1ab8987 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make jq
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_vm_init.sh > /opt/sdnc_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/sdnc_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/sdnc_vm_init.sh
-chmod +x /opt/sdnc_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./sdnc_vm_init.sh\"|g" /opt/sdnc_serv.sh
-mv /opt/sdnc_serv.sh /etc/init.d
-update-rc.d sdnc_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO sdnc
similarity index 98%
rename from boot/sdnc_vm_init.sh
rename to heat/ONAP/cloud-config/sdnc_vm_init.sh
index a523684..7816eab 100644 (file)
@@ -49,4 +49,4 @@ else
        echo "Timeout expired before SDC BE health check passed. SDNC containers starting, but UEB Listener may not be healthy"
 fi
 
-/opt/docker/docker-compose up -d
\ No newline at end of file
+/opt/docker/docker-compose up -d
similarity index 97%
rename from boot/serv.sh
rename to heat/ONAP/cloud-config/serv.sh
index d34bd19..62466d9 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:
+# Provides:          __vm_init_script__
 # Required-Start:    $remote_fs $syslog
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
@@ -18,7 +18,7 @@ then
 fi
 
 dir="/opt"
-cmd=""
+cmd="./__vm_init_script__"
 user="root"
 
 name=`basename $0`
index bdd3a63..2dd8320 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sms_vm_init.sh > /opt/sms_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/sms_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/sms_vm_init.sh
-chmod +x /opt/sms_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./sms_vm_init.sh\"|g" /opt/sms_serv.sh
-mv /opt/sms_serv.sh /etc/init.d
-update-rc.d sms_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
index e47a73f..3a8f3fc 100644 (file)
@@ -1,12 +1,8 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 OPENSTACK_API_KEY=$(cat /opt/config/openstack_api_key.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -17,66 +13,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip so_vm_init.sh > /opt/so_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/so_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/so_vm_init.sh
-chmod +x /opt/so_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./so_vm_init.sh\"|g" /opt/so_serv.sh
-mv /opt/so_serv.sh /etc/init.d
-update-rc.d so_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers.
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO test_lab
similarity index 98%
rename from boot/so_vm_init.sh
rename to heat/ONAP/cloud-config/so_vm_init.sh
index 58ee992..fb19d1a 100644 (file)
@@ -8,7 +8,6 @@ OPENSTACK_USERNAME=$(cat /opt/config/openstack_username.txt)
 OPENSTACK_APIKEY=$(cat /opt/config/api_key.txt)
 export MSO_DOCKER_IMAGE_VERSION=$(cat /opt/config/docker_version.txt)
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
-export OPENO_IP=$(cat /opt/config/openo_ip.txt)
 
 # Deployments in OpenStack require a keystone file
 if [ -e /opt/config/keystone.txt ]
index 2f36e9f..23dbce7 100644 (file)
@@ -1,11 +1,7 @@
 #!/bin/bash
 
 # Read configuration files
-ARTIFACTS_VERSION=$(cat /opt/config/artifacts_version.txt)
-DNS_IP_ADDR=$(cat /opt/config/dns_ip_addr.txt)
-CLOUD_ENV=$(cat /opt/config/cloud_env.txt)
 GERRIT_BRANCH=$(cat /opt/config/gerrit_branch.txt)
-MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
 CODE_REPO=$(cat /opt/config/remote_repo.txt)
 HTTP_PROXY=$(cat /opt/config/http_proxy.txt)
 HTTPS_PROXY=$(cat /opt/config/https_proxy.txt)
@@ -16,66 +12,6 @@ then
     export https_proxy=$HTTPS_PROXY
 fi
 
-# Add host name to /etc/host to avoid warnings in openstack images
-if [[ $CLOUD_ENV != "rackspace" ]]
-then
-       echo 127.0.0.1 $(hostname) >> /etc/hosts
-
-       # Allow remote login as root
-       mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
-       cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
-fi
-
-# Download dependencies
-apt-get update
-apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make
-
-# Download scripts from Nexus
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vid_vm_init.sh > /opt/vid_vm_init.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip serv.sh > /opt/vid_serv.sh
-unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip imagetest.sh > /opt/imagetest.sh
-chmod +x /opt/imagetest.sh
-chmod +x /opt/vid_vm_init.sh
-chmod +x /opt/vid_serv.sh
-sed -i "s|cmd=\"\"|cmd=\"./vid_vm_init.sh\"|g" /opt/vid_serv.sh
-mv /opt/vid_serv.sh /etc/init.d
-update-rc.d vid_serv.sh defaults
-
-# Download and install docker-engine and docker-compose
-echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/docker.list
-apt-get update
-apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
-apt-get install -y --allow-unauthenticated docker-engine
-
-mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
-chmod +x /opt/docker/docker-compose
-
-# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
-DNS_FLAG=""
-if [ -s /opt/config/dns_ip_addr.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
-fi
-if [ -s /opt/config/external_dns.txt ]
-then
-       DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
-fi
-echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
-
-cp /lib/systemd/system/docker.service /etc/systemd/system
-sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
-if [ $HTTP_PROXY != "no_proxy" ]
-then
-cd /opt
-./imagetest.sh
-fi
-service docker restart
-
-# DNS IP address configuration
-echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
-resolvconf -u
-
 # Clone Gerrit repository and run docker containers
 cd /opt
 git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
index 3c49ea3..427a9ad 100644 (file)
@@ -86,7 +86,7 @@ parameters:
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
+  multiserv_ip_addr: 10.0.14.1
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
index 5e925a6..e986653 100644 (file)
@@ -99,7 +99,7 @@ parameters:
 
   nexus_password:
     type: string
-    description: Nexus Repository Password
+    description: Nexus Repository password
 
   artifacts_version:
     type: string
@@ -207,7 +207,7 @@ parameters:
     type: string
   clamp_ip_addr:
     type: string
-  openo_ip_addr:
+  multiserv_ip_addr:
     type: string
   music_ip_addr:
     type: string
@@ -661,6 +661,16 @@ resources:
             echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
             echo "__openstack_region__" > /opt/config/openstack_region.txt
 
+            # Add host name to /etc/host to avoid warnings in openstack images
+            if [[ "__cloud_env__" != "rackspace" ]]
+            then
+              echo 127.0.0.1 $(hostname) >> /etc/hosts
+
+              # Allow remote login as root
+              mv /root/.ssh/authorized_keys /root/.ssh/authorized_keys.bk
+              cp /home/ubuntu/.ssh/authorized_keys /root/.ssh
+            fi
+
             if [ __http_proxy__ != "no_proxy" ]
             then
               echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
@@ -674,15 +684,61 @@ resources:
               export https_proxy=__https_proxy__
             fi
 
-            # Download and run install script
             apt update
-            apt-get -y install unzip
+            apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual apt-transport-https ca-certificates wget git ntp ntpdate make jq unzip
+
+            # Download boot scripts
             if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            while [ ! -s /opt/boot-__artifacts_version__.zip ]; do
-              curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            cd /opt
+            while [ -z "$ZIP_NAME" ] || [ ! -s "$ZIP_NAME" ]; do
+              wget --content-disposition "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__"
+              ZIP_NAME=$(ls -1 /opt/boot-*.zip)
             done
-            ln -s /opt/boot-__artifacts_version__.zip /opt/boot.zip
+            mkdir -p /opt/boot
+            unzip $ZIP_NAME -d /opt/boot
+
+            # Enable autorestart when VM reboots
+            update-rc.d serv.sh defaults
+
+            # Download and install docker-engine
+            echo "deb https://apt.dockerproject.org/repo ubuntu-$(lsb_release -cs) main" | tee /etc/apt/sources.list.d/docker.list
+            apt-get update
+            apt-get install -y --allow-unauthenticated docker-engine
+
+            # Install docker-compose
+            mkdir -p /opt/docker
+            curl -L "https://github.com/docker/compose/releases/download/1.16.1/docker-compose-$(uname -s)-$(uname -m)" > /opt/docker/docker-compose
+            chmod +x /opt/docker/docker-compose
 
+            # Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
+            DNS_FLAG=""
+            if [ -s /opt/config/dns_ip_addr.txt ]
+            then
+              DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/dns_ip_addr.txt) "
+            fi
+            if [ -s /opt/config/external_dns.txt ]
+            then
+              DNS_FLAG=$DNS_FLAG"--dns $(cat /opt/config/external_dns.txt) "
+            fi
+            MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
+            echo "DOCKER_OPTS=\"$DNS_FLAG--mtu=$MTU\"" >> /etc/default/docker
+
+            cp /lib/systemd/system/docker.service /etc/systemd/system
+            sed -i "/ExecStart/s/$/ --mtu=$MTU/g" /etc/systemd/system/docker.service
+            if [ __http_proxy__ != "no_proxy" ]
+            then
+              echo "[Service]" > /etc/systemd/system/docker.service.d/http-proxy.conf
+              echo "Environment=\"http_proxy=http://__http_proxy__" >> /etc/systemd/system/docker.service.d/http-proxy.conf
+              echo "Environment=\"https_proxy=https://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
+              echo "Environment=\"HTTP_PROXY=HTTP://__http_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
+              echo "Environment=\"HTTPS_PROXY=HTTPS://__https_proxy__" >>/etc/systemd/system/docker.service.d/http-proxy.conf
+            fi
+            systemctl daemon-reload
+            service docker restart
+
+            # DNS IP address configuration
+            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
+            resolvconf -u
 
   # DNS Server instantiation
   dns_private_port:
@@ -747,7 +803,7 @@ resources:
               __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
               __vid_ip_addr__: { get_param: vid_ip_addr }
               __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __openo_ip_addr__: { get_param: openo_ip_addr }
+              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
               __music_ip_addr__: { get_param: music_ip_addr }
               __oof_ip_addr__: { get_param: oof_ip_addr }
               __aaf_ip_addr__: { get_param: aaf_ip_addr }
@@ -772,7 +828,7 @@ resources:
               echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
               echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
               echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-              echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
+              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
               echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
               echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
               echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
@@ -824,6 +880,17 @@ resources:
         - path: /opt/aai_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/aai_install.sh }
+        - path: /opt/aai_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aai_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: aai_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   aai1_vm_config:
     type: OS::Heat::MultipartMime
@@ -890,6 +957,17 @@ resources:
         - path: /opt/aai_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/aai_install.sh }
+        - path: /opt/aai_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aai_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: aai_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   aai2_vm_config:
     type: OS::Heat::MultipartMime
@@ -957,6 +1035,17 @@ resources:
         - path: /opt/so_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/so_install.sh }
+        - path: /opt/so_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/so_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: so_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   so_vm_config:
     type: OS::Heat::MultipartMime
@@ -969,7 +1058,6 @@ resources:
             params:
               __keystone_url__: { get_param: keystone_url }
               __dmaap_topic__: { get_param: dmaap_topic }
-              __openo_ip__: { get_param: openo_ip_addr }
               __docker_version__: { get_param: so_docker }
               __gerrit_branch__: { get_param: so_branch }
               __so_repo__: { get_param: so_repo }
@@ -977,7 +1065,6 @@ resources:
               #!/bin/bash
 
               # Create configuration files
-              echo "__openo_ip__" > /opt/config/openo_ip.txt
               echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
               ln -s /opt/config/openstack_tenant_id.txt /opt/config/tenant_id.txt
               echo "__keystone_url__" > /opt/config/keystone.txt
@@ -1028,6 +1115,20 @@ resources:
         - path: /opt/mr_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/mr_install.sh }
+        - path: /opt/mr_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/mr_vm_init.sh }
+        - path: /opt/dbcl_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/dbcl_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: mr_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   mrouter_vm_config:
     type: OS::Heat::MultipartMime
@@ -1092,6 +1193,17 @@ resources:
         - path: /opt/robot_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/robot_install.sh }
+        - path: /opt/robot_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/robot_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: robot_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   robot_vm_config:
     type: OS::Heat::MultipartMime
@@ -1120,7 +1232,7 @@ resources:
               __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
               __vid_ip_addr__: { get_param: vid_ip_addr }
               __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __openo_ip_addr__: { get_param: openo_ip_addr }
+              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
               __music_ip_addr__: { get_param: music_ip_addr }
               __oof_ip_addr__: { get_param: oof_ip_addr }
               __aaf_ip_addr__: { get_param: aaf_ip_addr }
@@ -1164,8 +1276,10 @@ resources:
               echo "__sdnc_ip_addr__" > /opt/config/sdnc_portal_ip_addr.txt
               echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
               echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-              echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-              echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
+              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
+              echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt
+              ln -s /opt/config/msb_ip_addr.txt /opt/config/openo_ip_addr.txt # need this temporarily until testsuite docker image is released
+              echo "__multiserv_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
               echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
               echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
               echo "__oof_ip_addr__" > /opt/config/oof_homing_ip_addr.txt
@@ -1232,6 +1346,17 @@ resources:
         - path: /opt/vid_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/vid_install.sh }
+        - path: /opt/vid_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/vid_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: vid_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   vid_vm_config:
     type: OS::Heat::MultipartMime
@@ -1296,6 +1421,17 @@ resources:
         - path: /opt/sdnc_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/sdnc_install.sh }
+        - path: /opt/sdnc_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sdnc_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: sdnc_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   sdnc_vm_config:
     type: OS::Heat::MultipartMime
@@ -1371,6 +1507,20 @@ resources:
         - path: /opt/sdc_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/sdc_install.sh }
+        - path: /opt/sdc_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sdc_vm_init.sh }
+        - path: /opt/sdc_wfd_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sdc_wfd_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: sdc_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   sdc_vm_config:
     type: OS::Heat::MultipartMime
@@ -1443,6 +1593,17 @@ resources:
         - path: /opt/portal_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/portal_install.sh }
+        - path: /opt/portal_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/portal_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: portal_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   portal_vm_config:
     type: OS::Heat::MultipartMime
@@ -1511,6 +1672,17 @@ resources:
         - path: /opt/policy_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/policy_install.sh }
+        - path: /opt/policy_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/policy_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: policy_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   policy_vm_config:
     type: OS::Heat::MultipartMime
@@ -1577,6 +1749,17 @@ resources:
         - path: /opt/appc_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/appc_install.sh }
+        - path: /opt/appc_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/appc_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: appc_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   appc_vm_config:
     type: OS::Heat::MultipartMime
@@ -1645,6 +1828,17 @@ resources:
         - path: /opt/clamp_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/clamp_install.sh }
+        - path: /opt/clamp_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/clamp_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: clamp_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   clamp_vm_config:
     type: OS::Heat::MultipartMime
@@ -1675,22 +1869,22 @@ resources:
               ./clamp_install.sh
 
 
-  # OPEN-O VM instantiation
-  openo_private_port:
+  # MultiService VM instantiation
+  multiserv_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}]
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: multiserv_ip_addr }}]
       security_groups:
       - { get_resource: onap_sg }
 
-  openo_floating_ip:
+  multiserv_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: openo_private_port }
+      port_id: { get_resource: multiserv_private_port }
 
-  openo_vm:
+  multiserv_vm:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
@@ -1702,25 +1896,36 @@ resources:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
-        - port: { get_resource: openo_private_port }
+        - port: { get_resource: multiserv_private_port }
       user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: openo_vm_config }
+      user_data: { get_resource: multiserv_vm_config }
 
-  openo_vm_scripts:
+  multiserv_vm_scripts:
     type: OS::Heat::CloudConfig
     properties:
       cloud_config:
         write_files:
-        - path: /opt/openo_install.sh
+        - path: /opt/multiserv_install.sh
           permissions: '0755'
-          content: { get_file: cloud-config/openo_install.sh }
-
-  openo_vm_config:
+          content: { get_file: cloud-config/multiserv_install.sh }
+        - path: /opt/cli_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/cli_install.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: multiserv_all_serv.sh
+              template:
+                get_file: cloud-config/serv.sh
+
+  multiserv_vm_config:
     type: OS::Heat::MultipartMime
     properties:
       parts:
       - config: { get_resource: common_config_script }
-      - config: { get_resource: openo_vm_scripts }
+      - config: { get_resource: multiserv_vm_scripts }
       - config:
           str_replace:
             params:
@@ -1738,7 +1943,7 @@ resources:
               __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
               __vid_ip_addr__: { get_param: vid_ip_addr }
               __clamp_ip_addr__: { get_param: clamp_ip_addr }
-              __openo_ip_addr__: { get_param: openo_ip_addr }
+              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
               __vnfsdk_branch__: { get_param: vnfsdk_branch }
               __msb_docker__: { get_param: msb_docker }
               __mvim_docker__: { get_param: mvim_docker }
@@ -1808,14 +2013,14 @@ resources:
               echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt
               echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt
               echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt
-              echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export MULTISERV_IP=__multiserv_ip_addr__" >> /opt/config/onap_ips.txt
 
               cd /opt
-              ./openo_install.sh
+              ./multiserv_install.sh
 
 
   # DCAE GEN 2 Controller instantiation
-  dcae_c_private_port:
+  dcae_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_onap }
@@ -1823,13 +2028,13 @@ resources:
       security_groups:
       - { get_resource: onap_sg }
 
-  dcae_c_floating_ip:
+  dcae_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dcae_c_private_port }
+      port_id: { get_resource: dcae_private_port }
 
-  dcae_c_vm:
+  dcae_vm:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
@@ -1841,13 +2046,11 @@ resources:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
-        - port: { get_resource: dcae_c_private_port }
-      #security_groups:
-      #  - { get_resource: onap_sg }
+        - port: { get_resource: dcae_private_port }
       user_data_format: SOFTWARE_CONFIG
-      user_data: { get_resource: dcae_c_vm_config }
+      user_data: { get_resource: dcae_vm_config }
 
-  dcae_c_vm_scripts:
+  dcae_vm_scripts:
     type: OS::Heat::CloudConfig
     properties:
       cloud_config:
@@ -1855,13 +2058,21 @@ resources:
         - path: /opt/dcae2_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/dcae2_install.sh }
-
-  dcae_c_vm_config:
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: dcae2_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
+
+  dcae_vm_config:
     type: OS::Heat::MultipartMime
     properties:
       parts:
       - config: { get_resource: common_config_script }
-      - config: { get_resource: dcae_c_vm_scripts }
+      - config: { get_resource: dcae_vm_scripts }
       - config:
           str_replace:
             params:
@@ -1870,9 +2081,9 @@ resources:
               __docker_version__: { get_param: dcae_docker }
               # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
               __dcae_deployment_profile__: { get_param: dcae_deployment_profile }
-              __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
+              __mac_addr__: { get_attr: [dcae_private_port, mac_address] }
               __dcae_ip_addr__: { get_param: dcae_ip_addr }
-              __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+              __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] }
               __dns_forwarder__: { get_param: dns_forwarder }
               __dcae_domain__: { get_param: dcae_domain }
               # conf for VMs DCAE is to bringup
@@ -1888,7 +2099,6 @@ resources:
                   template: 'onap_sg_rand'
                   params:
                     rand: { get_resource: random-str }
-              #__dcaeos_security_group__: { get_attr: [onap_sg, name] }
               __dcaeos_username__: { get_param: openstack_username }
               __dcaeos_password__: { get_param: openstack_api_key }
               __dcaeos_key_name__: { get_resource: vm_key }
@@ -1910,7 +2120,7 @@ resources:
               __mr_ip_addr__: { get_param: mr_ip_addr }
               __policy_ip_addr__: { get_param: policy_ip_addr }
               __sdc_ip_addr__: { get_param: sdc_ip_addr }
-              __openo_ip_addr__: { get_param: openo_ip_addr }
+              __multiserv_ip_addr__: { get_param: multiserv_ip_addr }
               __aai1_ip_addr__: { get_param: aai1_ip_addr }
               __aai2_ip_addr__: { get_param: aai2_ip_addr }
               # floating IPs
@@ -1920,8 +2130,8 @@ resources:
               __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] }
               __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] }
               __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
-              __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
-              __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+              __multiserv_floating_ip_addr__: { get_attr: [multiserv_floating_ip, floating_ip_address] }
+              __dcae_floating_ip_addr__: { get_attr: [dcae_floating_ip, floating_ip_address] }
               # container versions
               __dcae_docker__:  { get_param: dcae_docker }
               __dcae_snmptrap_docker__:  { get_param: dcae_snmptrap_docker }
@@ -1942,7 +2152,6 @@ resources:
               __holmes_em_docker__:  { get_param: holmes_em_docker }
               __holmes_rm_docker__:  { get_param: holmes_rm_docker }
 
-
             template: |
               #!/bin/bash
 
@@ -1956,7 +2165,6 @@ resources:
               echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt
               echo "__mac_addr__" > /opt/config/mac_addr.txt
               echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-              echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
               echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
               echo "__dcae_domain__" > /opt/config/dcae_domain.txt
               # conf for the OpenStack env where DCAE is deployed
@@ -1989,8 +2197,8 @@ resources:
               echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
               echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
               echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-              echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-              echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt
+              echo "__multiserv_ip_addr__" > /opt/config/multiserv_ip_addr.txt
+              echo "__multiserv_ip_addr__" > /opt/config/msb_ip_addr.txt
               echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
               echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
               # floating IPs
@@ -2000,8 +2208,8 @@ resources:
               echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt
               echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt
               echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
-              echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt
-              echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt
+              echo "__multiserv_floating_ip_addr__" > /opt/config/multiserv_floating_ip_addr.txt
+              echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
               # container versions
               echo "__dcae_docker__" > /opt/config/dcae_docker.txt
               echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
@@ -2023,7 +2231,7 @@ resources:
               echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
 
               cd /opt
-              ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
+              ./dcae2_install.sh 2>&1 | tee -a /tmp/dcae2_install.log
 
 
   # MUSIC instantiation
@@ -2065,6 +2273,17 @@ resources:
         - path: /opt/music_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/music_install.sh }
+        - path: /opt/music_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/music_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: music_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   music_vm_config:
     type: OS::Heat::MultipartMime
@@ -2129,6 +2348,17 @@ resources:
         - path: /opt/oof_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/oof_install.sh }
+        - path: /opt/oof_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/oof_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: oof_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   oof_vm_config:
     type: OS::Heat::MultipartMime
@@ -2199,6 +2429,17 @@ resources:
         - path: /opt/aaf_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/aaf_install.sh }
+        - path: /opt/aaf_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aaf_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: aaf_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   aaf_vm_config:
     type: OS::Heat::MultipartMime
@@ -2265,6 +2506,17 @@ resources:
         - path: /opt/sms_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/sms_install.sh }
+        - path: /opt/sms_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sms_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: sms_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   sms_vm_config:
     type: OS::Heat::MultipartMime
@@ -2331,6 +2583,17 @@ resources:
         - path: /opt/nbi_install.sh
           permissions: '0755'
           content: { get_file: cloud-config/nbi_install.sh }
+        - path: /opt/nbi_vm_init.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/nbi_vm_init.sh }
+        - path: /etc/init.d/serv.sh
+          permissions: '0755'
+          content:
+            str_replace:
+              params:
+                __vm_init_script__: nbi_vm_init.sh
+              template:
+                get_file: cloud-config/serv.sh
 
   nbi_vm_config:
     type: OS::Heat::MultipartMime
index 2232bc0..e9c1cc1 100644 (file)
@@ -86,7 +86,7 @@ parameters:
   sdnc_ip_addr: 10.0.7.1
   vid_ip_addr: 10.0.8.1
   clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
+  multiserv_ip_addr: 10.0.14.1
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1