Add ansible server for APPC
[demo.git] / heat / ONAP / onap_openstack.yaml
index 5e925a6..e2dc3ab 100644 (file)
@@ -3,7 +3,7 @@
 #==================LICENSE_START==========================================
 #
 #
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -99,7 +99,7 @@ parameters:
 
   nexus_password:
     type: string
-    description: Nexus Repository Password
+    description: Nexus Repository password
 
   artifacts_version:
     type: string
@@ -121,13 +121,9 @@ parameters:
     type: string
     description: OpenStack username
 
-  openstack_auth_method:
-    type: string
-    description: OpenStack authentication method (password VS. api-key)
-
   openstack_api_key:
     type: string
-    description: OpenStack password or API Key
+    description: Encrypted OpenStack password
 
   keystone_url:
     type: string
@@ -207,7 +203,7 @@ parameters:
     type: string
   clamp_ip_addr:
     type: string
-  openo_ip_addr:
+  multiserv_ip_addr:
     type: string
   music_ip_addr:
     type: string
@@ -228,64 +224,9 @@ parameters:
 
   dcae_deployment_profile:
     type: string
-    default: R2
+    default: R3
     description: DCAE deployment profile.  Currently supported profiles R2, R2MVP, and R2PLUS.
 
-  dnsaas_config_enabled:
-    type: string
-    default: ""
-    description: (deprecated in R2) whether the DNSaaS configuration section is enabled
-
-  dnsaas_region:
-    type: string
-    default: ""
-    description: (deprecated in R2) the region of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_keystone_url:
-    type: string
-    default: ""
-    description: (deprecated in R2) the keystone URL of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_username:
-    type: string
-    default: ""
-    description: (deprecated in R2) the username of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_password:
-    type: string
-    default: ""
-    description: (deprecated in R2) the password of the cloud instance providing the Designate DNS as a Service
-
-  dnsaas_tenant_name:
-    type: string
-    default: ""
-    description: (deprecated in R2) the name of the tenant in the cloud instance providing the Designate DNS as a Service
-
-  dcae_keystone_url:
-    type: string
-    default: ""
-    description: (deprecated in R2) the keystone URL for DCAE to use (via MultiCloud)
-
-  dcae_private_key:
-    type: string
-    default: ""
-    description: (deprecated in R2) the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
-
-  dcae_public_key:
-    type: string
-    default: ""
-    description: (deprecated in R2) the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
-
-  dcae_centos_7_image:
-    type: string
-    default: ""
-    description: (deprecated in R2) the id/name of the CentOS 7 VM imange
-
-  dcae_domain:
-    type: string
-    default: ""
-    description: (deprecated in R2) the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
-
   #####################
   #                   #
   # ONAP repositories #
@@ -341,66 +282,94 @@ parameters:
   dcae_docker:
     type: string
     default: latest
-  dcae_snmptrap_docker:
+  dcae_bootstrap_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
-  dcae_ves_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.bootstrap
+  dcae_k8sbootstrap_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector
-  dcae_bootstrap_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container
+  dcae_redisc_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.deployments.bootstrap
-  dcae_cm_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.redis-cluster-container
+  dcae_hc_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.deployments.cm-container
-  dcae_k8sbootstrap_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.healthcheck-container
+  dcae_tls_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container
-  dcae_redisc_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.tls-init-container
+  dcae_cb_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container
+    description: Docker image version for onap/org.onap.dcaegen2.platform.cdapbroker
+  dcae_snmptrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.collectors.snmptrap
+  dcae_ves_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.collectors.ves.vescollector
+  dcae_hvves_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.collectors.hv-ves.hv-collector-main
+  dcae_datafile_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.collectors.datafile.datafile-app-server
+  dcae_cm_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.cm-container
   dcae_tca_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container
-  dcae_cb_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.deployments.tca-cdap-container
+  dcae_tca2_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.cdapbroker
+    description: Docker image version for onap/org.onap.dcaegen2.analytics.tca-gen2
   dcae_cbs_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.configbinding
+    description: Docker image version for onap/org.onap.dcaegen2.platform.configbinding.app-app
   dcae_dh_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+    description: Docker image version for onap/org.onap.dcaegen2.platform.deployment-handler
   dcae_inv_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.inventory-api
+    description: Docker image version for onap/org.onap.dcaegen2.platform.inventory-api
   dcae_ph_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+    description: Docker image version for onap/org.onap.dcaegen2.platform.policy-handler
   dcae_sch_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler
+    description: Docker image version for onap/org.onap.dcaegen2.platform.servicechange-handler
+  dcae_prh_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.services.prh.prh-app-server
   dcae_heartbeat_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.services.heartbeat
-  dcae_prh_docker:
+    description: Docker image version for onap/org.onap.dcaegen2.services.heartbeat
+  dcae_mua_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor
+  dcae_msnmp_docker:
     type: string
     default: latest
-    description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
+    description: Docker image version for onap/org.onap.dcaegen2.services.mapper.vesadapter.snmpmapper
   holmes_em_docker:
     type: string
     default: latest
@@ -440,6 +409,8 @@ parameters:
     type: string
   dgbuilder_docker:
     type: string
+  ansible_docker:
+    type: string
   cli_docker:
     type: string
   music_docker:
@@ -459,6 +430,8 @@ parameters:
   dbcl_docker:
     type: string
 
+  vfc_db_docker:
+    type: string
   vfc_nokia_docker:
     type: string
   vfc_nokiav2_docker:
@@ -661,6 +634,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 +657,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 +776,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 +801,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 +853,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 +930,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 +1008,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 +1031,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 +1038,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 +1088,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 +1166,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 +1205,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 }
@@ -1131,6 +1216,7 @@ resources:
               __vm_flavor__: { get_param: flavor_medium }
               __public_net_id__: { get_param: public_net_id }
               __oam_network_id__: { get_resource: oam_onap }
+              __sec_group__: { get_resource: onap_sg }
               __script_version__: { get_param: artifacts_version }
               __docker_version__: { get_param: robot_docker }
               __sniro_docker_version__: { get_param: sniro_docker }
@@ -1151,6 +1237,15 @@ resources:
               echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
               echo "__dcae_collector_ip__" > /opt/config/dcae_collector_ip.txt
               echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
+              # in HEAT install the components are on the same IP address but not for OOM
+              echo "__so_ip_addr__" > /opt/config/so_apihand_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_asdchand_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_bpmn_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_catdb_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_openstack_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_reqdb_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_sdnc_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_vfc_ip_addr.txt
               echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
               echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
               echo "__policy_ip_addr__" > /opt/config/policy_healthcheck_ip_addr.txt
@@ -1164,8 +1259,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
@@ -1183,6 +1280,7 @@ resources:
                 echo "__public_net_id__" > /opt/config/public_net_id.txt
               fi
               echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+              echo "__sec_group__" > /opt/config/sec_group.txt
               echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
               echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
               echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
@@ -1232,6 +1330,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 +1405,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 +1491,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 +1577,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 +1656,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 +1733,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
@@ -1591,6 +1758,7 @@ resources:
               __docker_version__: { get_param: appc_docker }
               __gerrit_branch__: { get_param: appc_branch }
               __dgbuilder_docker__: { get_param: dgbuilder_docker }
+              __ansible_docker__: { get_param: ansible_docker }
               __appc_repo__: { get_param: appc_repo }
             template: |
               #!/bin/bash
@@ -1600,6 +1768,7 @@ resources:
               echo "__docker_version__" > /opt/config/docker_version.txt
               echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
               echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
+              echo "__ansible_docker__" > /opt/config/ansible_version.txt
               echo "__appc_repo__" > /opt/config/remote_repo.txt
 
               cd /opt
@@ -1645,6 +1814,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 +1855,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 +1882,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 +1929,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 }
@@ -1746,6 +1937,7 @@ resources:
               __uui_docker__: { get_param: uui_docker }
               __esr_docker__: { get_param: esr_docker }
               __vnfsdk_repo__: { get_param: vnfsdk_repo }
+              __vfc_db_docker__: { get_param: vfc_db_docker }
               __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
               __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
               __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
@@ -1776,6 +1968,7 @@ resources:
               echo "__esr_docker__" > /opt/config/esr_docker.txt
               echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
+              echo "export DB_DOCKER_VER=__vfc_db_docker__" >> /opt/config/vfc_docker.txt
               echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
               echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
               echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
@@ -1808,14 +2001,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 +2016,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 +2034,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 +2046,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,47 +2069,14 @@ 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] }
-              __dns_forwarder__: { get_param: dns_forwarder }
-              __dcae_domain__: { get_param: dcae_domain }
-              # conf for VMs DCAE is to bringup
-              __openstack_keystone_url__: { get_param: keystone_url }
-              __dcae_keystone_url__: { get_param: dcae_keystone_url }
-              __dcaeos_cloud_env__: { get_param: cloud_env }
-              __dcaeos_keystone_url__: { get_param: dcae_keystone_url }
-              __dcaeos_region__: { get_param: openstack_region }
-              __dcaeos_tenant_id__: { get_param: openstack_tenant_id }
-              __dcaeos_tenant_name__: { get_param: openstack_tenant_name }
-              __dcaeos_security_group__:
-                str_replace:
-                  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 }
-              __dcaeos_public_key__: { get_param: dcae_public_key }
-              __dcaeos_private_key__: { get_param: dcae_private_key }
-              __dcaeos_private_network_name__: { get_attr: [oam_onap, name] }
-              __dcaeos_public_network_name__: { get_param: public_net_name }
-              __dcaeos_ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-              __dcaeos_centos_7_image__: { get_param: dcae_centos_7_image }
-              __dcaeos_flavor_id__: { get_param: flavor_medium }
-              __dcaeos_flavor_id_cdap__: { get_param: flavor_large }
-              __dcaeos_dnsaas_config_enabled__: { get_param: dnsaas_config_enabled }
-              __dcaeos_dnsaas_region__: { get_param: dnsaas_region }
-              __dcaeos_dnsaas_keystone_url__: { get_param: dnsaas_keystone_url }
-              __dnsaas_tenant_name__: { get_param: dnsaas_tenant_name }
-              __dcaeos_dnsaas_username__: { get_param: dnsaas_username }
-              __dcaeos_dnsaas_password__: { get_param: dnsaas_password }
+              __dcae_float_ip__: { get_attr: [dcae_floating_ip, floating_ip_address] }
               # fixed private IPs
               __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,29 +2086,35 @@ 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 }
-              __dcae_ves_docker__:  { get_param: dcae_ves_docker }
               __dcae_bootstrap_docker__:  { get_param: dcae_bootstrap_docker }
-              __dcae_cm_docker__:  { get_param: dcae_cm_docker }
               __dcae_k8sbootstrap_docker__:  { get_param: dcae_k8sbootstrap_docker }
               __dcae_redisc_docker__:  { get_param: dcae_redisc_docker }
-              __dcae_tca_docker__:  { get_param: dcae_tca_docker }
+              __dcae_hc_docker__:  { get_param: dcae_hc_docker }
+              __dcae_tls_docker__:  { get_param: dcae_tls_docker }
               __dcae_cb_docker__:  { get_param: dcae_cb_docker }
+              __dcae_snmptrap_docker__:  { get_param: dcae_snmptrap_docker }
+              __dcae_ves_docker__:  { get_param: dcae_ves_docker }
+              __dcae_hvves_docker__: { get_param: dcae_hvves_docker }
+              __dcae_datafile_docker__: { get_param: dcae_datafile_docker }
+              __dcae_cm_docker__:  { get_param: dcae_cm_docker }
+              __dcae_tca_docker__:  { get_param: dcae_tca_docker }
+              __dcae_tca2_docker__:  { get_param: dcae_tca2_docker }
               __dcae_cbs_docker__:  { get_param: dcae_cbs_docker }
               __dcae_dh_docker__:  { get_param: dcae_dh_docker }
               __dcae_inv_docker__:  { get_param: dcae_inv_docker }
               __dcae_ph_docker__:  { get_param: dcae_ph_docker }
               __dcae_sch_docker__:  { get_param: dcae_sch_docker }
-              __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
               __dcae_prh_docker__:  { get_param: dcae_prh_docker }
+              __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
+              __dcae_mua_docker__:  { get_param: dcae_mua_docker }
+              __dcae_msnmp_docker__:  { get_param: dcae_msnmp_docker }
               __holmes_em_docker__:  { get_param: holmes_em_docker }
               __holmes_rm_docker__:  { get_param: holmes_rm_docker }
-
-
+  
             template: |
               #!/bin/bash
 
@@ -1956,41 +2128,12 @@ 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
-              echo "__openstack_keystone_url__" > /opt/config/openstack_keystone_url.txt
-              echo "__dcaeos_cloud_env__" > /opt/config/cloud_env.txt
-              echo "__dcaeos_keystone_url__" > /opt/config/keystone_url.txt
-              echo "__dcaeos_region__" > /opt/config/openstack_region.txt
-              echo "__dcaeos_tenant_id__" > /opt/config/tenant_id.txt
-              echo "__dcaeos_tenant_name__" > /opt/config/tenant_name.txt
-              echo "__dcaeos_username__" > /opt/config/openstack_user.txt
-              echo "__dcaeos_password__" > /opt/config/openstack_password.txt
-              echo "__dcaeos_key_name__" > /opt/config/key_name.txt
-              echo "__dcaeos_public_key__" > /opt/config/pub_key.txt
-              echo "__dcaeos_private_key__" > /opt/config/priv_key
-              echo "__dcaeos_private_network_name__" > /opt/config/openstack_private_network_name.txt
-              echo "__dcaeos_public_network_name__" > /opt/config/public_net_name.txt
-              echo "__dcaeos_public_network_name__" > /opt/config/public_net_id.txt
-              echo "__dcaeos_ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-              echo "__dcaeos_centos_7_image__" > /opt/config/centos_7_image.txt
-              echo "__dcaeos_security_group__" > /opt/config/security_group.txt
-              echo "__dcaeos_flavor_id__" > /opt/config/flavor_id.txt
-              echo "__dcaeos_flavor_id_cdap__" > /opt/config/flavor_id_cdap.txt
-              echo "__dcaeos_dnsaas_config_enabled__" > /opt/config/dnsaas_config_enabled.txt
-              echo "__dcaeos_dnsaas_region__" > /opt/config/dnsaas_region.txt
-              echo "__dcaeos_dnsaas_keystone_url__" > /opt/config/dnsaas_keystone_url.txt
-              echo "__dnsaas_tenant_name__" > /opt/config/dnsaas_tenant_name.txt
-              echo "__dcaeos_dnsaas_username__" > /opt/config/dnsaas_username.txt
-              echo "__dcaeos_dnsaas_password__" > /opt/config/dnsaas_password.txt
               # fixed private IP addresses of other ONAP components
               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,30 +2143,37 @@ 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
-              echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
               echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt
-              echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt
               echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt
               echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt
-              echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt
+              echo "__dcae_hc_docker__" > /opt/config/dcae_docker_hc.txt
+              echo "__dcae_tls_docker__" > /opt/config/dcae_docker_tls.txt
               echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt
+              echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
+              echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
+              echo "__dcae_hvves_docker__" > /opt/config/dcae_docker_hvves.txt
+              echo "__dcae_datafile_docker__" > /opt/config/dcae_docker_datafile.txt
+              echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt
+              echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt
+              echo "__dcae_tca2_docker__" > /opt/config/dcae_docker_tca2.txt
               echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt
               echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt
               echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt
               echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt
               echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt
-              echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
               echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt
+              echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
+              echo "__dcae_mua_docker__" > /opt/config/dcae_docker_mua.txt
+              echo "__dcae_msnmp_docker__" > /opt/config/dcae_docker_msnmp.txt
               echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
               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 +2215,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 +2290,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 +2371,20 @@ 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: /opt/config/sample_ca/aaf.signer.b64
+          permissions: '0600'
+          content: { get_file: cloud-config/sample_ca/aaf.signer.b64 }
+        - 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
@@ -2212,14 +2398,17 @@ resources:
               __docker_version__: { get_param: aaf_docker }
               __aaf_repo__: { get_param: aaf_repo }
               __gerrit_branch__: { get_param: aaf_branch }
+              __public_ip__: { get_attr: [aaf_floating_ip, floating_ip_address] }
               __local_ip__: { get_param: aaf_ip_addr }
             template: |
               #!/bin/bash
 
               # Create configuration files
+              mkdir -p /opt/config/sample_ca
               echo "__docker_version__" > /opt/config/docker_version.txt
               echo "__aaf_repo__" > /opt/config/remote_repo.txt
               echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__public_ip__" > /opt/config/public_ip.txt
               echo "__local_ip__" > /opt/config/local_ip.txt
 
               cd /opt
@@ -2265,6 +2454,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 +2531,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