Refactor ONAP HEAT template config scripts

Change-Id: I5f95acc7c67d48ea1f7f9e819d6c9e742e4b52cc
Issue-ID: INT-605
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

21 files changed, 3309 insertions, 1497 deletions

diff --git a/heat/ONAP/cloud-config/aaf_install.sh b/heat/ONAP/cloud-config/aaf_install.sh
new file mode 100644
index 00000000..171592ce
--- /dev/null
+++ b/heat/ONAP/cloud-config/aaf_install.sh
@@ -0,0 +1,502 @@
+#!/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)
+
+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
+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
+
+# Clone Gerrit repository and run docker containers
+cd /opt
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
+chmod +x /opt/authz/auth/auth-cass/docker/dinstall.sh
+chmod +x /opt/authz/auth/auth-cass/docker/backup/backup.sh
+chmod +x /opt/authz/auth/docker/dbuild.sh
+chmod +x /opt/authz/auth/docker/drun.sh
+chmod +x /opt/authz/auth/docker/dstart.sh
+chmod +x /opt/authz/auth/docker/dstop.sh
+
+#Update maven settings
+cat > /usr/share/maven/conf/settings.xml << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!--
+ | This is the configuration file for Maven. It can be specified at two levels:
+ |
+ |  1. User Level. This settings.xml file provides configuration for a single user,
+|                 and is normally provided in \${user.home}/.m2/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -s /path/to/user/settings.xml
+ |
+ |  2. Global Level. This settings.xml file provides configuration for all Maven
+ |                 users on a machine (assuming they're all using the same Maven
+ |                 installation). It's normally provided in
+|                 \${maven.home}/conf/settings.xml.
+ |
+ |                 NOTE: This location can be overridden with the CLI option:
+ |
+ |                 -gs /path/to/global/settings.xml
+ |
+ | The sections in this sample file are intended to give you a running start at
+ | getting the most out of your Maven installation. Where appropriate, the default
+ | values (values used when the setting is not specified) are provided.
+ |
+ |-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <!-- localRepository
+   | The path to the local repository maven will use to store artifacts.
+   |
+| Default: \${user.home}/.m2/repository
+  <localRepository>/path/to/local/repo</localRepository>
+  -->
+
+  <!-- interactiveMode
+   | This will determine whether maven prompts you when it needs input. If set to false,
+   | maven will use a sensible default value, perhaps based on some other setting, for
+   | the parameter in question.
+   |
+   | Default: true
+  <interactiveMode>true</interactiveMode>
+  -->
+
+  <!-- offline
+   | Determines whether maven should attempt to connect to the network when executing a build.
+   | This will have an effect on artifact downloads, artifact deployment, and others.
+   |
+   | Default: false
+  <offline>false</offline>
+  -->
+
+  <!-- pluginGroups
+   | This is a list of additional group identifiers that will be searched when resolving plugins by their prefix, i.e.
+   | when invoking a command line like "mvn prefix:goal". Maven will automatically add the group identifiers
+   | "org.apache.maven.plugins" and "org.codehaus.mojo" if these are not already contained in the list.
+   |-->
+  <pluginGroups>
+    <!-- pluginGroup
+     | Specifies a further group identifier to use for plugin lookup.
+    <pluginGroup>com.your.plugins</pluginGroup>
+    -->
+  </pluginGroups>
+
+  <!-- proxies
+   | This is a list of proxies which can be used on this machine to connect to the network.
+   | Unless otherwise specified (by system property or command-line switch), the first proxy
+   | specification in this list marked as active will be used.
+   |-->
+  <proxies>
+    <proxy>
+      <id>optional</id>
+      <active>true</active>
+      <protocol>http</protocol>
+      <username>proxyuser</username>
+      <password>proxypass</password>
+      <host>$(cat /opt/config/http_proxy.txt | cut -d ':' -f1)</host>
+      <port>$(cat /opt/config/http_proxy.txt | cut -d ':' -f2)</port>
+      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
+    </proxy>
+    <proxy>
+      <id>optional</id>
+      <active>true</active>
+      <protocol>https</protocol>
+      <username>proxyuser</username>
+      <password>proxypass</password>
+      <host>$(cat /opt/config/https_proxy.txt | cut -d ':' -f1)</host>
+      <port>$(cat /opt/config/https_proxy.txt | cut -d ':' -f2)</port>
+      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
+    </proxy>
+  </proxies>
+
+
+  <!-- servers
+   | This is a list of authentication profiles, keyed by the server-id used within the system.
+   | Authentication profiles can be used whenever maven must make a connection to a remote server.
+   |-->
+  <servers>
+    <!-- server
+     | Specifies the authentication information to use when connecting to a particular server, identified by
+     | a unique name within the system (referred to by the 'id' attribute below).
+     |
+     | NOTE: You should either specify username/password OR privateKey/passphrase, since these pairings are
+     |       used together.
+     |
+    <server>
+      <id>deploymentRepo</id>
+      <username>repouser</username>
+      <password>repopwd</password>
+    </server>
+    -->
+
+    <!-- Another sample, using keys to authenticate.
+    <server>
+      <id>siteServer</id>
+      <privateKey>/path/to/private/key</privateKey>
+      <passphrase>optional; leave empty if not used.</passphrase>
+    </server>
+    -->
+  </servers>
+
+  <!-- mirrors
+   | This is a list of mirrors to be used in downloading artifacts from remote repositories.
+   |
+   | It works like this: a POM may declare a repository to use in resolving certain artifacts.
+   | However, this repository may have problems with heavy traffic at times, so people have mirrored
+   | it to several places.
+   |
+   | That repository definition will have a unique id, so we can create a mirror reference for that
+   | repository, to be used as an alternate download site. The mirror site will be the preferred
+   | server for that repository.
+   |-->
+
+  <!-- profiles
+   | This is a list of profiles which can be activated in a variety of ways, and which can modify
+   | the build process. Profiles provided in the settings.xml are intended to provide local machine-
+   | specific paths and repository locations which allow the build to work in the local environment.
+   |
+   | For example, if you have an integration testing plugin - like cactus - that needs to know where
+   | your Tomcat instance is installed, you can provide a variable here such that the variable is
+   | dereferenced during the build process to configure the cactus plugin.
+   |
+   | As noted above, profiles can be activated in a variety of ways. One way - the activeProfiles
+   | section of this document (settings.xml) - will be discussed later. Another way essentially
+   | relies on the detection of a system property, either matching a particular value for the property,
+   | or merely testing its existence. Profiles can also be activated by JDK version prefix, where a
+   | value of '1.4' might activate a profile when the build is executed on a JDK version of '1.4.2_07'.
+   | Finally, the list of active profiles can be specified directly from the command line.
+   |
+   | NOTE: For profiles defined in the settings.xml, you are restricted to specifying only artifact
+   |       repositories, plugin repositories, and free-form properties to be used as configuration
+   |       variables for plugins in the POM.
+   |
+   |-->
+
+
+
+  
+  
+  <profiles>
+      <profile>
+          
+          <id>10_nexus</id>
+          <!--Enable snapshots for the built in central repo to direct -->
+          <!--all requests to nexus via the mirror -->
+          <repositories>
+              <repository>
+                  <id>10_nexus</id>
+                  <url>http://repo.maven.apache.org/maven2/</url>
+                  <releases><enabled>true</enabled></releases>
+                  <snapshots><enabled>true</enabled></snapshots>
+              </repository>
+          </repositories>
+          
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>10_nexus</id>
+                  <url>http://repo.maven.apache.org/maven2/</url>
+                  <releases><enabled>true</enabled></releases>
+                  <snapshots><enabled>true</enabled></snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+          
+      </profile>
+      <profile>
+          <id>20_openecomp-public</id>
+          <repositories>
+              <repository>
+                  <id>20_openecomp-public</id>
+                  <name>20_openecomp-public</name>
+                  <url>https://nexus.onap.org/content/repositories/public/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>20_openecomp-public</id>
+                  <name>20_openecomp-public</name>
+                  <url>https://nexus.onap.org/content/repositories/public/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+      <profile>
+          <id>30_openecomp-staging</id>
+          <repositories>
+              <repository>
+                  <id>30_openecomp-staging</id>
+                  <name>30_openecomp-staging</name>
+                  <url>https://nexus.onap.org/content/repositories/staging/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>30_openecomp-staging</id>
+                  <name>30_openecomp-staging</name>
+                  <url>https://nexus.onap.org/content/repositories/staging/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+      <profile>
+          <id>40_openecomp-release</id>
+          <repositories>
+              <repository>
+                  <id>40_openecomp-release</id>
+                  <name>40_openecomp-release</name>
+                  <url>https://nexus.onap.org/content/repositories/releases/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>40_openecomp-release</id>
+                  <name>40_openecomp-release</name>
+                  <url>https://nexus.onap.org/content/repositories/releases/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+      
+      <profile>
+          <id>50_openecomp-snapshots</id>
+          <repositories>
+              <repository>
+                  <id>50_openecomp-snapshot</id>
+                  <name>50_openecomp-snapshot</name>
+                  <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+                  <releases>
+                      <enabled>false</enabled>
+                  </releases>
+                  <snapshots>
+                      <enabled>true</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>50_openecomp-snapshot</id>
+                  <name>50_openecomp-snapshot</name>
+                  <url>https://nexus.onap.org/content/repositories/snapshots/</url>
+                  <releases>
+                      <enabled>false</enabled>
+                  </releases>
+                  <snapshots>
+                      <enabled>true</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+      <profile>
+          <id>60_opendaylight-release</id>
+          <repositories>
+              <repository>
+                  <id>60_opendaylight-mirror</id>
+                  <name>60_opendaylight-mirror</name>
+                  <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>60_opendaylight-mirror</id>
+                  <name>60_opendaylight-mirror</name>
+                  <url>https://nexus.opendaylight.org/content/repositories/public/</url>
+                  <releases>
+                      <enabled>true</enabled>
+                      <updatePolicy>daily</updatePolicy>
+                  </releases>
+                  <snapshots>
+                      <enabled>false</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+      
+      <profile>
+          <id>70_opendaylight-snapshots</id>
+          <repositories>
+              <repository>
+                  <id>70_opendaylight-snapshot</id>
+                  <name>70_opendaylight-snapshot</name>
+                  <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+                  <releases>
+                      <enabled>false</enabled>
+                  </releases>
+                  <snapshots>
+                      <enabled>true</enabled>
+                  </snapshots>
+              </repository>
+          </repositories>
+          <pluginRepositories>
+              <pluginRepository>
+                  <id>70_opendaylight-snapshot</id>
+                  <name>70_opendaylight-snapshot</name>
+                  <url>https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/</url>
+                  <releases>
+                      <enabled>false</enabled>
+                  </releases>
+                  <snapshots>
+                      <enabled>true</enabled>
+                  </snapshots>
+              </pluginRepository>
+          </pluginRepositories>
+      </profile>
+  </profiles>
+  
+  <activeProfiles>
+      <activeProfile>10_nexus</activeProfile>
+      <activeProfile>20_openecomp-public</activeProfile>
+      <activeProfile>30_openecomp-staging</activeProfile>
+      <activeProfile>40_openecomp-release</activeProfile>
+      <activeProfile>50_openecomp-snapshots</activeProfile>
+      <activeProfile>60_opendaylight-release</activeProfile>
+      <activeProfile>70_opendaylight-snapshots</activeProfile>
+
+  </activeProfiles>
+  
+</settings>
+EOF
+
+cd /opt/authz
+mvn install -Dmaven.test.skip=true
+
+cd /opt
+./aaf_vm_init.sh
diff --git a/heat/ONAP/cloud-config/aai_install.sh b/heat/ONAP/cloud-config/aai_install.sh
new file mode 100644
index 00000000..b238fd6e
--- /dev/null
+++ b/heat/ONAP/cloud-config/aai_install.sh
@@ -0,0 +1,97 @@
+#!/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)
+
+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 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
+
+if [[ $AAI_INSTANCE == "aai_instance_1" ]]
+then
+	mkdir -p /opt/aai/logroot/AAI-RESOURCES
+	mkdir -p /opt/aai/logroot/AAI-TRAVERSAL
+	mkdir -p /opt/aai/logroot/AAI-ML
+	mkdir -p /opt/aai/logroot/AAI-SDB
+	mkdir -p /opt/aai/logroot/AAI-DRMS
+	mkdir -p /opt/aai/logroot/AAI-UI
+	chown -R 999:999 /opt/aai/logroot/AAI-RESOURCES /opt/aai/logroot/AAI-TRAVERSAL
+
+	sleep 300
+fi
+
+./aai_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/appc_install.sh b/heat/ONAP/cloud-config/appc_install.sh
new file mode 100644
index 00000000..e871bfc1
--- /dev/null
+++ b/heat/ONAP/cloud-config/appc_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./appc_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/clamp_install.sh b/heat/ONAP/cloud-config/clamp_install.sh
new file mode 100644
index 00000000..ffe4d14e
--- /dev/null
+++ b/heat/ONAP/cloud-config/clamp_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./clamp_vm_init.sh
diff --git a/heat/ONAP/cloud-config/cli_install.sh b/heat/ONAP/cloud-config/cli_install.sh
new file mode 100644
index 00000000..4593c686
--- /dev/null
+++ b/heat/ONAP/cloud-config/cli_install.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+#*******************************************************************************
+# Copyright 2017 Huawei Technologies Co., Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#*******************************************************************************
+
+CLI_LATEST_BINARY="https://nexus.onap.org/content/repositories/releases/org/onap/cli/cli-zip/1.1.0/cli-zip-1.1.0.zip"
+CLI_INSTALL_DIR=/opt/onap/cli
+CLI_ZIP=cli.zip
+CLI_BIN=/usr/bin/onap
+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
+
+export ONAP_CLI_HOME=$CLI_INSTALL_DIR
+export CLI_PRODUCT_VERSION=onap-1.1
+
+#create install dir
+if [ -d $CLI_INSTALL_DIR ]
+then
+    mv $CLI_INSTALL_DIR $CLI_INSTALL_DIR/../cli_`date +"%m-%d-%y-%H-%M-%S"`
+    rm $CLI_BIN
+fi
+
+mkdir -p $CLI_INSTALL_DIR
+cd $CLI_INSTALL_DIR
+
+#Download and unzip CLI
+apt-get install -y wget unzip
+
+#check for java
+java -version
+if [ $? == 127 ]
+then
+    apt-get install -y openjdk-8-jre
+fi
+
+wget -O $CLI_ZIP $CLI_LATEST_BINARY
+
+unzip $CLI_ZIP
+if [ ! -d ./data ]; then mkdir ./data; fi
+if [ ! -d ./onap-cli-schema ]; then mkdir ./onap-cli-schema; fi
+chmod +x ./bin/onap.sh
+
+#Make onap available in path
+ln ./bin/onap.sh $CLI_BIN
+
+#Print the version
+onap -v
+
+cd -
diff --git a/heat/ONAP/cloud-config/dcae2_install.sh b/heat/ONAP/cloud-config/dcae2_install.sh
new file mode 100755
index 00000000..d0f5fd6e
--- /dev/null
+++ b/heat/ONAP/cloud-config/dcae2_install.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+#############################################################################
+#
+# Copyright (c) 2017 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.
+# You may obtain a copy of the License at
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#############################################################################
+
+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)
+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
+
+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
+
+# 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
+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
+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
+
+# add hostname aliases
+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
+
+# private key
+sed -e 's/\\n/\n/g' /opt/config/priv_key | sed -e 's/^[ \t]*//g; s/[ \t]*$//g' > /opt/app/config/key
+chmod 777 /opt/app/config/key
+
+cd /opt
+./dcae2_vm_init.sh
diff --git a/heat/ONAP/cloud-config/dns_install.sh b/heat/ONAP/cloud-config/dns_install.sh
new file mode 100644
index 00000000..1f940ac3
--- /dev/null
+++ b/heat/ONAP/cloud-config/dns_install.sh
@@ -0,0 +1,99 @@
+#!/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)
+
+if [ $HTTP_PROXY != "no_proxy" ]
+then
+    export http_proxy=$HTTP_PROXY
+    export https_proxy=$HTTPS_PROXY
+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"
+else
+	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
+
+# 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
+
+# Set the private IP address of each ONAP VM in the Bind configuration in OpenStack deployments
+if [[ $CLOUD_ENV != "rackspace" ]]
+then
+    sed -i "s/dns_forwarder/"$(cat /opt/config/dns_forwarder.txt)"/g" /etc/bind/named.conf.options
+	sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/named.conf.options
+	sed -i "s/external_dns/"$(cat /opt/config/external_dns.txt)"/g" /etc/bind/named.conf.options
+	sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	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/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
+	sed -i "s/sms_ip_addr/"$(cat /opt/config/sms_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+	sed -i "s/nbi_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.openecomp.org
+
+	sed -i "s/aai1_ip_addr/"$(cat /opt/config/aai1_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/aai2_ip_addr/"$(cat /opt/config/aai2_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/appc_ip_addr/"$(cat /opt/config/appc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/dcae_ip_addr/"$(cat /opt/config/dcae_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/dns_ip_addr/"$(cat /opt/config/dns_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/so_ip_addr/"$(cat /opt/config/so_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/mr_ip_addr/"$(cat /opt/config/mr_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/policy_ip_addr/"$(cat /opt/config/policy_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/portal_ip_addr/"$(cat /opt/config/portal_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/robot_ip_addr/"$(cat /opt/config/robot_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/sdc_ip_addr/"$(cat /opt/config/sdc_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	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/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
+	sed -i "s/sms_ip_addr/"$(cat /opt/config/sms_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+	sed -i "s/nbi_ip_addr/"$(cat /opt/config/nbi_ip_addr.txt)"/g" /etc/bind/zones/db.simpledemo.onap.org
+fi
+
+# Configure Bind
+modprobe ip_gre
+sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
+service bind9 restart
+
diff --git a/heat/ONAP/cloud-config/mr_install.sh b/heat/ONAP/cloud-config/mr_install.sh
new file mode 100644
index 00000000..b7573589
--- /dev/null
+++ b/heat/ONAP/cloud-config/mr_install.sh
@@ -0,0 +1,87 @@
+#!/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)
+
+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 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
+./mr_vm_init.sh
diff --git a/heat/ONAP/cloud-config/music_install.sh b/heat/ONAP/cloud-config/music_install.sh
new file mode 100644
index 00000000..84ba5629
--- /dev/null
+++ b/heat/ONAP/cloud-config/music_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./music_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/nbi_install.sh b/heat/ONAP/cloud-config/nbi_install.sh
new file mode 100644
index 00000000..7705a25a
--- /dev/null
+++ b/heat/ONAP/cloud-config/nbi_install.sh
@@ -0,0 +1,83 @@
+#!/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)
+
+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
+
+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
diff --git a/heat/ONAP/cloud-config/oof_install.sh b/heat/ONAP/cloud-config/oof_install.sh
new file mode 100644
index 00000000..d8eda1de
--- /dev/null
+++ b/heat/ONAP/cloud-config/oof_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./oof_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/openo_install.sh b/heat/ONAP/cloud-config/openo_install.sh
new file mode 100644
index 00000000..57e00949
--- /dev/null
+++ b/heat/ONAP/cloud-config/openo_install.sh
@@ -0,0 +1,97 @@
+#!/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
diff --git a/heat/ONAP/cloud-config/policy_install.sh b/heat/ONAP/cloud-config/policy_install.sh
new file mode 100644
index 00000000..c77323d1
--- /dev/null
+++ b/heat/ONAP/cloud-config/policy_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./policy_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/portal_install.sh b/heat/ONAP/cloud-config/portal_install.sh
new file mode 100644
index 00000000..d052d655
--- /dev/null
+++ b/heat/ONAP/cloud-config/portal_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./portal_vm_init.sh
diff --git a/heat/ONAP/cloud-config/robot_install.sh b/heat/ONAP/cloud-config/robot_install.sh
new file mode 100644
index 00000000..7896ecde
--- /dev/null
+++ b/heat/ONAP/cloud-config/robot_install.sh
@@ -0,0 +1,89 @@
+#!/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)
+
+if [ $HTTP_PROXY != "no_proxy" ]
+then
+    export http_proxy=$HTTP_PROXY
+    export https_proxy=$HTTPS_PROXY
+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
+chmod +x /opt/eteshare/config/vm_config2robot.sh
+unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip 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
+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
diff --git a/heat/ONAP/cloud-config/sdc_install.sh b/heat/ONAP/cloud-config/sdc_install.sh
new file mode 100644
index 00000000..55963734
--- /dev/null
+++ b/heat/ONAP/cloud-config/sdc_install.sh
@@ -0,0 +1,117 @@
+#!/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)
+
+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 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
+
+if [[ $CLOUD_ENV == "rackspace" ]]
+then
+	DISK="xvdb"
+else
+	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
+mkfs -t ext4 /dev/$DISK"1"
+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
+mkdir -p /data/environments
+mkdir -p /data/scripts
+mkdir -p /data/logs/BE
+mkdir -p /data/logs/FE
+chmod 777 /data
+chmod 777 /data/logs/BE
+chmod 777 /data/logs/FE
+
+git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
+
+cat > /root/.bash_aliases << EOF
+alias dcls='/data/scripts/docker_clean.sh \$1'
+alias dlog='/data/scripts/docker_login.sh \$1'
+alias rund='/data/scripts/docker_run.sh'
+alias health='/data/scripts/docker_health.sh'
+EOF
+
+# Run docker containers. For openstack Ubuntu 16.04 images this will run as a service after the VM has restarted
+./sdc_vm_init.sh
+./sdc_wfd_vm_init.sh
diff --git a/heat/ONAP/cloud-config/sdnc_install.sh b/heat/ONAP/cloud-config/sdnc_install.sh
new file mode 100644
index 00000000..2c82eea5
--- /dev/null
+++ b/heat/ONAP/cloud-config/sdnc_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./sdnc_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/sms_install.sh b/heat/ONAP/cloud-config/sms_install.sh
new file mode 100644
index 00000000..bdd3a630
--- /dev/null
+++ b/heat/ONAP/cloud-config/sms_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./sms_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/cloud-config/so_install.sh b/heat/ONAP/cloud-config/so_install.sh
new file mode 100644
index 00000000..e47a73f2
--- /dev/null
+++ b/heat/ONAP/cloud-config/so_install.sh
@@ -0,0 +1,86 @@
+#!/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)
+
+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 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
+SO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
+echo -n "$OPENSTACK_API_KEY" | openssl aes-128-ecb -e -K $SO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
+
+./so_vm_init.sh
diff --git a/heat/ONAP/cloud-config/vid_install.sh b/heat/ONAP/cloud-config/vid_install.sh
new file mode 100644
index 00000000..2f36e9f0
--- /dev/null
+++ b/heat/ONAP/cloud-config/vid_install.sh
@@ -0,0 +1,82 @@
+#!/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)
+
+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 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
+./vid_vm_init.sh
\ No newline at end of file
diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index bdd505cc..5e925a64 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -620,6 +620,70 @@ resources:
       subnet_id: { get_resource: oam_onap_subnet }
 
 
+  common_config_script:
+    type: OS::Heat::SoftwareConfig
+    properties:
+      group: ungrouped
+      config:
+        str_replace:
+          params:
+            __artifacts_version__: { get_param: artifacts_version }
+            __cloud_env__: { get_param: cloud_env }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __external_dns__: { get_param: external_dns }
+            __http_proxy__: { get_param: http_proxy }
+            __https_proxy__: { get_param: https_proxy }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __openstack_username__: { get_param: openstack_username }
+            __openstack_tenant_id__: { get_param: openstack_tenant_id }
+            __openstack_api_key__: { get_param: openstack_api_key }
+            __openstack_region__: { get_param: openstack_region }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__http_proxy__" > /opt/config/http_proxy.txt
+            echo "__https_proxy__" > /opt/config/https_proxy.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__openstack_username__" > /opt/config/openstack_username.txt
+            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
+            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
+            echo "__openstack_region__" > /opt/config/openstack_region.txt
+
+            if [ __http_proxy__ != "no_proxy" ]
+            then
+              echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
+              echo "{" >> /etc/apt/apt.conf.d/apt.conf
+              echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
+              echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
+              echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
+              echo "};" >> /etc/apt/apt.conf.d/apt.conf
+
+              export http_proxy=__http_proxy__
+              export https_proxy=__https_proxy__
+            fi
+
+            # Download and run install script
+            apt update
+            apt-get -y install unzip
+            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
+            done
+            ln -s /opt/boot-__artifacts_version__.zip /opt/boot.zip
+
+
   # DNS Server instantiation
   dns_private_port:
     type: OS::Neutron::Port
@@ -648,91 +712,76 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: dns_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __artifacts_version__: { get_param: artifacts_version }
-            __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __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 }
-            __music_ip_addr__: { get_param: music_ip_addr }
-            __oof_ip_addr__: { get_param: oof_ip_addr }
-            __aaf_ip_addr__: { get_param: aaf_ip_addr }
-            __sms_ip_addr__: { get_param: sms_ip_addr }
-            __nbi_ip_addr__: { get_param: nbi_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __dns_forwarder__: { get_param: dns_forwarder }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__robot_ip_addr__" > /opt/config/robot_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            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 "__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
-            echo "__sms_ip_addr__" > /opt/config/sms_ip_addr.txt
-            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dns_install.sh
-            cd /opt
-            chmod +x dns_install.sh
-            ./dns_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: dns_vm_config }
+
+  dns_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/dns_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/dns_install.sh }
+
+  dns_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: dns_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
+              __aai1_ip_addr__: { get_param: aai1_ip_addr }
+              __aai2_ip_addr__: { get_param: aai2_ip_addr }
+              __appc_ip_addr__: { get_param: appc_ip_addr }
+              __dcae_ip_addr__: { get_param: dcae_ip_addr }
+              __so_ip_addr__: { get_param: so_ip_addr }
+              __mr_ip_addr__: { get_param: mr_ip_addr }
+              __policy_ip_addr__: { get_param: policy_ip_addr }
+              __portal_ip_addr__: { get_param: portal_ip_addr }
+              __robot_ip_addr__: { get_param: robot_ip_addr }
+              __sdc_ip_addr__: { get_param: sdc_ip_addr }
+              __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 }
+              __music_ip_addr__: { get_param: music_ip_addr }
+              __oof_ip_addr__: { get_param: oof_ip_addr }
+              __aaf_ip_addr__: { get_param: aaf_ip_addr }
+              __sms_ip_addr__: { get_param: sms_ip_addr }
+              __nbi_ip_addr__: { get_param: nbi_ip_addr }
+              __dns_forwarder__: { get_param: dns_forwarder }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+              echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+              echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
+              echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
+              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+              echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+              echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+              echo "__robot_ip_addr__" > /opt/config/robot_ip_addr.txt
+              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+              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 "__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
+              echo "__sms_ip_addr__" > /opt/config/sms_ip_addr.txt
+              echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
+              echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
+
+              cd /opt
+              ./dns_install.sh
 
 
   # A&AI instantiation (2 VMs)
@@ -764,64 +813,43 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: aai1_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_1" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: aai1_vm_config }
+
+  aai1_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/aai_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aai_install.sh }
+
+  aai1_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: aai1_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __dmaap_topic__: { get_param: dmaap_topic }
+              __docker_version__: { get_param: aai_docker }
+              __gerrit_branch__: { get_param: aai_branch }
+              __aai_repo__: { get_param: aai_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "aai_instance_1" > /opt/config/aai_instance.txt
+              echo "__aai_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./aai_install.sh
 
 
   aai2_private_port:
@@ -851,64 +879,43 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: aai2_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_2" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: aai2_vm_config }
+
+  aai2_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/aai_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aai_install.sh }
+
+  aai2_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: aai2_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __dmaap_topic__: { get_param: dmaap_topic }
+              __docker_version__: { get_param: aai_docker }
+              __gerrit_branch__: { get_param: aai_branch }
+              __aai_repo__: { get_param: aai_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "aai_instance_2" > /opt/config/aai_instance.txt
+              echo "__aai_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./aai_install.sh
 
 
   # SO instantiation
@@ -939,75 +946,47 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: so_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __openo_ip__: { get_param: openo_ip_addr }
-            __docker_version__: { get_param: so_docker }
-            __gerrit_branch__: { get_param: so_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __so_repo__: { get_param: so_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__openo_ip__" > /opt/config/openo_ip.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__so_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt so_install.sh
-            cd /opt
-            chmod +x so_install.sh
-            ./so_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: so_vm_config }
+
+  so_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/so_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/so_install.sh }
+
+  so_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: so_vm_scripts }
+      - config:
+          str_replace:
+            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 }
+            template: |
+              #!/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
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__so_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./so_install.sh
 
 
   # Message Router instantiation
@@ -1038,61 +1017,40 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: mrouter_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: mr_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __mr_repo__: { get_param: mr_repo }
-            __dbcl_docker__: { get_param: dbcl_docker }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__mr_repo__" > /opt/config/remote_repo.txt
-            echo "__dbcl_docker__" > /opt/config/docker_version.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt mr_install.sh
-            cd /opt
-            chmod +x mr_install.sh
-            ./mr_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: mrouter_vm_config }
+
+  mrouter_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/mr_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/mr_install.sh }
+
+  mrouter_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: mrouter_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __gerrit_branch__: { get_param: mr_branch }
+              __mr_repo__: { get_param: mr_repo }
+              __dbcl_docker__: { get_param: dbcl_docker }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__mr_repo__" > /opt/config/remote_repo.txt
+              echo "__dbcl_docker__" > /opt/config/docker_version.txt
+
+              cd /opt
+              ./mr_install.sh
 
 
   # Robot Framework instantiation
@@ -1123,144 +1081,116 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: robot_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __network_name__: { get_attr: [oam_onap, name] }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __artifacts_version__: { get_param: artifacts_version }
-            __openstack_region__: { get_param: openstack_region }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __keystone_url__: { get_param: keystone_url }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_collector_ip__: { get_param: dcae_ip_addr }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
-            __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
-            __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
-            __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 }
-            __music_ip_addr__: { get_param: music_ip_addr }
-            __oof_ip_addr__: { get_param: oof_ip_addr }
-            __aaf_ip_addr__: { get_param: aaf_ip_addr }
-            __nbi_ip_addr__: { get_param: nbi_ip_addr }
-            __external_dns__: { get_param: external_dns }
-            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __vm_image_name__: { get_param: ubuntu_1404_image }
-            __vm_flavor__: { get_param: flavor_medium }
-            __public_net_id__: { get_param: public_net_id }
-            __oam_network_id__: { get_resource: oam_onap }
-            __script_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: robot_docker }
-            __sniro_docker_version__: { get_param: sniro_docker }
-            __vnf_pub_key__: { get_param: pub_key }
-            __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__network_name__" > /opt/config/network.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_password.txt
-            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
-            echo "__openstack_region__" > /opt/config/region.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            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
-            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
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
-            echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
-            echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
-            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            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 "__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
-            echo "__oof_ip_addr__" > /opt/config/oof_sniro_ip_addr.txt
-            echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
-            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vm_flavor__" > /opt/config/vm_flavor.txt
-            echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
-            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
-            echo "__script_version__" > /opt/config/script_version.txt
-            if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
-              echo "__oam_network_id__" > /opt/config/public_net_id.txt
-            else
-              echo "__public_net_id__" > /opt/config/public_net_id.txt
-            fi
-            echo "__oam_network_id__" > /opt/config/oam_network_id.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
-            echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
-            echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt robot_install.sh
-            cd /opt
-            chmod +x robot_install.sh
-            ./robot_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: robot_vm_config }
+
+  robot_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/robot_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/robot_install.sh }
+
+  robot_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: robot_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __network_name__: { get_attr: [oam_onap, name] }
+              __keystone_url__: { get_param: keystone_url }
+              __aai1_ip_addr__: { get_param: aai1_ip_addr }
+              __aai2_ip_addr__: { get_param: aai2_ip_addr }
+              __appc_ip_addr__: { get_param: appc_ip_addr }
+              __dcae_ip_addr__: { get_param: dcae_ip_addr }
+              __dcae_collector_ip__: { get_param: dcae_ip_addr }
+              __so_ip_addr__: { get_param: so_ip_addr }
+              __mr_ip_addr__: { get_param: mr_ip_addr }
+              __policy_ip_addr__: { get_param: policy_ip_addr }
+              __portal_ip_addr__: { get_param: portal_ip_addr }
+              __sdc_ip_addr__: { get_param: sdc_ip_addr }
+              __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
+              __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
+              __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
+              __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 }
+              __music_ip_addr__: { get_param: music_ip_addr }
+              __oof_ip_addr__: { get_param: oof_ip_addr }
+              __aaf_ip_addr__: { get_param: aaf_ip_addr }
+              __nbi_ip_addr__: { get_param: nbi_ip_addr }
+              __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
+              __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
+              __vm_image_name__: { get_param: ubuntu_1404_image }
+              __vm_flavor__: { get_param: flavor_medium }
+              __public_net_id__: { get_param: public_net_id }
+              __oam_network_id__: { get_resource: oam_onap }
+              __script_version__: { get_param: artifacts_version }
+              __docker_version__: { get_param: robot_docker }
+              __sniro_docker_version__: { get_param: sniro_docker }
+              __vnf_pub_key__: { get_param: pub_key }
+              __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__network_name__" > /opt/config/network.txt
+              ln -s /opt/config/openstack_region.txt /opt/config/region.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__sniro_docker_version__" > /opt/config/sniro_docker_version.txt
+              echo "__keystone_url__" > /opt/config/keystone.txt
+              echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+              echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
+              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
+              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
+              echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+              echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
+              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+              echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+              echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+              echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
+              echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
+              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 "__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
+              echo "__oof_ip_addr__" > /opt/config/oof_sniro_ip_addr.txt
+              echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+              echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
+              echo "__vm_flavor__" > /opt/config/vm_flavor.txt
+              echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
+              echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
+              echo "__vm_image_name__" > /opt/config/vm_image_name.txt
+              echo "__script_version__" > /opt/config/script_version.txt
+              if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
+                echo "__oam_network_id__" > /opt/config/public_net_id.txt
+              else
+                echo "__public_net_id__" > /opt/config/public_net_id.txt
+              fi
+              echo "__oam_network_id__" > /opt/config/oam_network_id.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
+              echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
+              echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
+
+              cd /opt
+              ./robot_install.sh
 
 
   # VID instantiation
@@ -1291,61 +1221,40 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: vid_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: vid_docker }
-            __gerrit_branch__: { get_param: vid_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vid_repo__: { get_param: vid_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vid_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt vid_install.sh
-            cd /opt
-            chmod +x vid_install.sh
-            ./vid_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: vid_vm_config }
+
+  vid_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/vid_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/vid_install.sh }
+
+  vid_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: vid_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: vid_docker }
+              __gerrit_branch__: { get_param: vid_branch }
+              __vid_repo__: { get_param: vid_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__vid_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./vid_install.sh
 
 
   # SDN-C instantiation
@@ -1376,63 +1285,42 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: sdnc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: sdnc_docker }
-            __gerrit_branch__: { get_param: sdnc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdnc_repo__: { get_param: sdnc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            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 "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sdnc_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdnc_install.sh
-            cd /opt
-            chmod +x sdnc_install.sh
-            ./sdnc_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: sdnc_vm_config }
+
+  sdnc_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/sdnc_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sdnc_install.sh }
+
+  sdnc_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: sdnc_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: sdnc_docker }
+              __gerrit_branch__: { get_param: sdnc_branch }
+              __dgbuilder_docker__: { get_param: dgbuilder_docker }
+              __sdnc_repo__: { get_param: sdnc_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              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 "__sdnc_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./sdnc_install.sh
 
 
   # SDC instantiation
@@ -1472,69 +1360,48 @@ resources:
       block_device_mapping:
         - device_name: /dev/vdb
           volume_id: {get_resource: sdc_volume_data}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __env_name__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __private_ip__: { get_param: sdc_ip_addr }
-            __docker_version__: { get_param: sdc_docker }
-            __sdc_wfd_docker__: { get_param: sdc_wfd_docker }
-            __gerrit_branch__: { get_param: sdc_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdc_repo__: { get_param: sdc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__env_name__" > /opt/config/env_name.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__private_ip__" > /opt/config/private_ip.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sdc_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdc_install.sh
-            cd /opt
-            chmod +x sdc_install.sh
-            ./sdc_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: sdc_vm_config }
+
+  sdc_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/sdc_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sdc_install.sh }
+
+  sdc_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: sdc_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __env_name__: { get_param: dmaap_topic }
+              __mr_ip_addr__: { get_param: mr_ip_addr }
+              __private_ip__: { get_param: sdc_ip_addr }
+              __docker_version__: { get_param: sdc_docker }
+              __sdc_wfd_docker__: { get_param: sdc_wfd_docker }
+              __gerrit_branch__: { get_param: sdc_branch }
+              __sdc_repo__: { get_param: sdc_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__env_name__" > /opt/config/env_name.txt
+              echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+              echo "__private_ip__" > /opt/config/private_ip.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__sdc_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./sdc_install.sh
 
 
   # PORTAL instantiation
@@ -1565,65 +1432,45 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: portal_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: portal_docker }
-            __gerrit_branch__: { get_param: portal_branch }
-            __cli_docker__: { get_param: cli_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __portal_repo__: { get_param: portal_repo }
-          template: |
-            #!/bin/bash
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: portal_vm_config }
+
+  portal_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/portal_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/portal_install.sh }
+
+  portal_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: portal_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
+              __docker_version__: { get_param: portal_docker }
+              __gerrit_branch__: { get_param: portal_branch }
+              __cli_docker__: { get_param: cli_docker }
+              __portal_repo__: { get_param: portal_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__public_ip__" > /opt/config/public_ip.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__cli_docker__" > /opt/config/cli_docker_version.txt
+              echo "__portal_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./portal_install.sh
 
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__public_ip__" > /opt/config/public_ip.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cli_docker__" > /opt/config/cli_docker_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__portal_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt portal_install.sh
-            cd /opt
-            chmod +x portal_install.sh
-            ./portal_install.sh
 
   # Policy Engine instantiation
   policy_private_port:
@@ -1653,63 +1500,42 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: policy_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: policy_docker }
-            __gerrit_branch__: { get_param: policy_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __policy_repo__: { get_param: policy_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__public_ip__" > /opt/config/public_ip.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__policy_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt policy_install.sh
-            cd /opt
-            chmod +x policy_install.sh
-            ./policy_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: policy_vm_config }
+
+  policy_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/policy_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/policy_install.sh }
+
+  policy_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: policy_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
+              __docker_version__: { get_param: policy_docker }
+              __gerrit_branch__: { get_param: policy_branch }
+              __policy_repo__: { get_param: policy_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__public_ip__" > /opt/config/public_ip.txt
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__policy_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./policy_install.sh
 
 
   # APP-C instantiation
@@ -1740,65 +1566,44 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: appc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: appc_docker }
-            __gerrit_branch__: { get_param: appc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __appc_repo__: { get_param: appc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            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 "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__appc_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt appc_install.sh
-            cd /opt
-            chmod +x appc_install.sh
-            ./appc_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: appc_vm_config }
+
+  appc_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/appc_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/appc_install.sh }
+
+  appc_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: appc_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __dmaap_topic__: { get_param: dmaap_topic }
+              __docker_version__: { get_param: appc_docker }
+              __gerrit_branch__: { get_param: appc_branch }
+              __dgbuilder_docker__: { get_param: dgbuilder_docker }
+              __appc_repo__: { get_param: appc_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+              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 "__appc_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./appc_install.sh
 
 
   # CLAMP instantiation
@@ -1829,73 +1634,45 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: clamp_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: clamp_docker }
-            __gerrit_branch__: { get_param: clamp_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __clamp_repo__: { get_param: clamp_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__clamp_repo__" > /opt/config/remote_repo.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt clamp_install.sh
-            cd /opt
-            chmod +x clamp_install.sh
-            ./clamp_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: clamp_vm_config }
+
+  clamp_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/clamp_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/clamp_install.sh }
+
+  clamp_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: clamp_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __keystone_url__: { get_param: keystone_url }
+              __dmaap_topic__: { get_param: dmaap_topic }
+              __docker_version__: { get_param: clamp_docker }
+              __gerrit_branch__: { get_param: clamp_branch }
+              __clamp_repo__: { get_param: clamp_repo }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              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
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__clamp_repo__" > /opt/config/remote_repo.txt
+
+              cd /opt
+              ./clamp_install.sh
 
 
   # OPEN-O VM instantiation
@@ -1926,136 +1703,115 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: openo_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __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 }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vnfsdk_branch__: { get_param: vnfsdk_branch }
-            __msb_docker__: { get_param: msb_docker }
-            __mvim_docker__: { get_param: mvim_docker }
-            __mvim_openstack_docker__: { get_param: mvim_openstack_docker }
-            __uui_docker__: { get_param: uui_docker }
-            __esr_docker__: { get_param: esr_docker }
-            __vnfsdk_repo__: { get_param: vnfsdk_repo }
-            __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
-            __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
-            __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
-            __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
-            __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
-            __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
-            __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
-            __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker }
-            __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker }
-            __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker }
-            __vfc_huawei_docker__: { get_param: vfc_huawei_docker }
-            __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker }
-            __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker }
-            __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker }
-            __vfc_catalog_docker__: { get_param: vfc_catalog_docker }
-            __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker }
-            __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
-            echo "__msb_docker__" > /opt/config/msb_docker.txt
-            echo "__mvim_docker__" > /opt/config/mvim_docker.txt
-            echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt
-            echo "__uui_docker__" > /opt/config/uui_docker.txt
-            echo "__esr_docker__" > /opt/config/esr_docker.txt
-            echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.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
-            echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
-            echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
-            echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
-            echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt
-            echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt
-            echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt
-            echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt
-            echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt
-            echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt
-            echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt
-            echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt
-            echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt
-            echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt
-            echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt
-
-            # Create env file with the IP address of all ONAP components
-            echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
-            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 "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt openo_install.sh
-            cd /opt
-            chmod +x openo_install.sh
-            ./openo_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: openo_vm_config }
+
+  openo_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/openo_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/openo_install.sh }
+
+  openo_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: openo_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __oam_network_cidr__: { get_param: oam_network_cidr }
+              __aai1_ip_addr__: { get_param: aai1_ip_addr }
+              __aai2_ip_addr__: { get_param: aai2_ip_addr }
+              __appc_ip_addr__: { get_param: appc_ip_addr }
+              __dcae_ip_addr__: { get_param: dcae_ip_addr }
+              __so_ip_addr__: { get_param: so_ip_addr }
+              __mr_ip_addr__: { get_param: mr_ip_addr }
+              __policy_ip_addr__: { get_param: policy_ip_addr }
+              __portal_ip_addr__: { get_param: portal_ip_addr }
+              __robot_ip_addr__: { get_param: robot_ip_addr }
+              __sdc_ip_addr__: { get_param: sdc_ip_addr }
+              __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 }
+              __vnfsdk_branch__: { get_param: vnfsdk_branch }
+              __msb_docker__: { get_param: msb_docker }
+              __mvim_docker__: { get_param: mvim_docker }
+              __mvim_openstack_docker__: { get_param: mvim_openstack_docker }
+              __uui_docker__: { get_param: uui_docker }
+              __esr_docker__: { get_param: esr_docker }
+              __vnfsdk_repo__: { get_param: vnfsdk_repo }
+              __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
+              __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
+              __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+              __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
+              __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
+              __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
+              __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
+              __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker }
+              __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker }
+              __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker }
+              __vfc_huawei_docker__: { get_param: vfc_huawei_docker }
+              __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker }
+              __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker }
+              __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker }
+              __vfc_catalog_docker__: { get_param: vfc_catalog_docker }
+              __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker }
+              __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+              echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
+              echo "__msb_docker__" > /opt/config/msb_docker.txt
+              echo "__mvim_docker__" > /opt/config/mvim_docker.txt
+              echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt
+              echo "__uui_docker__" > /opt/config/uui_docker.txt
+              echo "__esr_docker__" > /opt/config/esr_docker.txt
+              echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.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
+              echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
+              echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
+              echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
+              echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt
+              echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt
+              echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt
+              echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt
+              echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt
+              echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt
+              echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt
+              echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt
+              echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt
+              echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt
+              echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt
+
+              # Create env file with the IP address of all ONAP components
+              echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
+              echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
+              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
+
+              cd /opt
+              ./openo_install.sh
 
 
   # DCAE GEN 2 Controller instantiation
@@ -2088,205 +1844,186 @@ resources:
         - port: { get_resource: dcae_c_private_port }
       #security_groups:
       #  - { get_resource: onap_sg }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __rand_str__: { get_resource: random-str }
-            # repo related
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: dcae_docker }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            # 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] }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __external_dns__: { get_param: external_dns }
-            __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 }
-            # 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 }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            # floating IPs
-            __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
-            __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
-            __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
-            __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] }
-            # 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_cb_docker__:  { get_param: dcae_cb_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 }
-            __holmes_em_docker__:  { get_param: holmes_em_docker }
-            __holmes_rm_docker__:  { get_param: holmes_rm_docker }
-
-
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__rand_str__" > /opt/config/dcae_zone.txt
-            echo "__rand_str__" > /opt/config/rand_str.txt
-            # repo related
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
-            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_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.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 "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            # floating IPs
-            echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt
-            echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt
-            echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt
-            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
-            # 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_cb_docker__" > /opt/config/dcae_docker_cb.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 "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
-            echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dcae2_install.sh
-            cd /opt
-            chmod +x dcae2_install.sh
-            ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: dcae_c_vm_config }
+
+  dcae_c_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/dcae2_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/dcae2_install.sh }
+
+  dcae_c_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: dcae_c_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __rand_str__: { get_resource: random-str }
+              # repo related
+              __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] }
+              __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 }
+              # 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 }
+              __aai1_ip_addr__: { get_param: aai1_ip_addr }
+              __aai2_ip_addr__: { get_param: aai2_ip_addr }
+              # floating IPs
+              __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
+              __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
+              __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
+              __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] }
+              # 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_cb_docker__:  { get_param: dcae_cb_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 }
+              __holmes_em_docker__:  { get_param: holmes_em_docker }
+              __holmes_rm_docker__:  { get_param: holmes_rm_docker }
+
+
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__rand_str__" > /opt/config/dcae_zone.txt
+              echo "__rand_str__" > /opt/config/rand_str.txt
+              # repo related
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+              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 "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+              echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+              # floating IPs
+              echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt
+              echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt
+              echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt
+              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
+              # 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_cb_docker__" > /opt/config/dcae_docker_cb.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 "__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
 
 
   # MUSIC instantiation
@@ -2317,61 +2054,40 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: music_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: music_docker }
-            __music_repo__: { get_param: music_repo }
-            __gerrit_branch__: { get_param: music_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__music_repo__" > /opt/config/remote_repo.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt music_install.sh
-            cd /opt
-            chmod +x music_install.sh
-            ./music_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: music_vm_config }
+
+  music_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/music_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/music_install.sh }
+
+  music_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: music_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: music_docker }
+              __music_repo__: { get_param: music_repo }
+              __gerrit_branch__: { get_param: music_branch }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__music_repo__" > /opt/config/remote_repo.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+
+              cd /opt
+              ./music_install.sh
 
 
   # OOF instantiation
@@ -2402,67 +2118,46 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: oof_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __has_docker_version__: { get_param: optf_has_docker }
-            __osdf_docker_version__: { get_param: optf_osdf_docker }
-            __music_docker_version__: { get_param: music_docker }
-            __cass_music_docker_version__: { get_param: cassandra_music_docker }
-            __oof_repo__: { get_param: oof_repo }
-            __gerrit_branch__: { get_param: oof_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__has_docker_version__" > /opt/config/has_docker_version.txt
-            echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
-            echo "__music_docker_version__" > /opt/config/music_version.txt
-            echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
-            echo "__oof_repo__" > /opt/config/remote_repo.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt oof_install.sh
-            cd /opt
-            chmod +x oof_install.sh
-            ./oof_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: oof_vm_config }
+
+  oof_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/oof_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/oof_install.sh }
+
+  oof_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: oof_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __has_docker_version__: { get_param: optf_has_docker }
+              __osdf_docker_version__: { get_param: optf_osdf_docker }
+              __music_docker_version__: { get_param: music_docker }
+              __cass_music_docker_version__: { get_param: cassandra_music_docker }
+              __oof_repo__: { get_param: oof_repo }
+              __gerrit_branch__: { get_param: oof_branch }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__has_docker_version__" > /opt/config/has_docker_version.txt
+              echo "__osdf_docker_version__" > /opt/config/osdf_docker_version.txt
+              echo "__music_docker_version__" > /opt/config/music_version.txt
+              echo "__cass_music_docker_version__" > /opt/config/cass_version.txt
+              echo "__oof_repo__" > /opt/config/remote_repo.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+
+              cd /opt
+              ./oof_install.sh
 
 
   # AAF instantiation
@@ -2493,63 +2188,43 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: aaf_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: aaf_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __aaf_repo__: { get_param: aaf_repo }
-            __gerrit_branch__: { get_param: aaf_branch }
-            __local_ip__: { get_param: aaf_ip_addr }
-          template: |
-            #!/bin/bash
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: aaf_vm_config }
+
+  aaf_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/aaf_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/aaf_install.sh }
+
+  aaf_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: aaf_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: aaf_docker }
+              __aaf_repo__: { get_param: aaf_repo }
+              __gerrit_branch__: { get_param: aaf_branch }
+              __local_ip__: { get_param: aaf_ip_addr }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              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 "__local_ip__" > /opt/config/local_ip.txt
+
+              cd /opt
+              ./aaf_install.sh
 
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aaf_repo__" > /opt/config/remote_repo.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__local_ip__" > /opt/config/local_ip.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aaf_install.sh
-            cd /opt
-            chmod +x aaf_install.sh
-            ./aaf_install.sh
 
   # SMS instantiation
   sms_private_port:
@@ -2579,63 +2254,43 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: sms_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: sms_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sms_repo__: { get_param: sms_repo }
-            __gerrit_branch__: { get_param: sms_branch }
-            __local_ip__: { get_param: sms_ip_addr }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sms_repo__" > /opt/config/remote_repo.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__local_ip__" > /opt/config/local_ip.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: sms_vm_config }
+
+  sms_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/sms_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/sms_install.sh }
+
+  sms_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: sms_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: sms_docker }
+              __sms_repo__: { get_param: sms_repo }
+              __gerrit_branch__: { get_param: sms_branch }
+              __local_ip__: { get_param: sms_ip_addr }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__sms_repo__" > /opt/config/remote_repo.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__local_ip__" > /opt/config/local_ip.txt
+
+              cd /opt
+              ./sms_install.sh
 
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sms_install.sh
-            cd /opt
-            chmod +x sms_install.sh
-            ./sms_install.sh
 
   # NBI instantiation
   nbi_private_port:
@@ -2665,64 +2320,43 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: nbi_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __http_proxy__: { get_param: http_proxy }
-            __https_proxy__: { get_param: https_proxy }
-            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: nbi_docker }
-            __nbi_repo__: { get_param: nbi_repo }
-            __gerrit_branch__: { get_param: nbi_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __so_ip_addr__: { get_param: so_ip_addr }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__nbi_repo__" > /opt/config/remote_repo.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
-            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-            echo "__http_proxy__" > /opt/config/http_proxy.txt
-            echo "__https_proxy__" > /opt/config/https_proxy.txt
-            if [ __http_proxy__ != "no_proxy" ]
-            then
-            echo "Acquire" > /etc/apt/apt.conf.d/apt.conf
-            echo "{" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  Retries \"0\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  http::Proxy \"http://__http_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "  https::Proxy \"https://__https_proxy__/\";" >> /etc/apt/apt.conf.d/apt.conf
-            echo "};" >> /etc/apt/apt.conf.d/apt.conf
-
-            # Download and run install script
-            export http_proxy=__http_proxy__
-            export https_proxy=__https_proxy__
-            fi
-            apt-get -y install unzip
-            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
-            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
-            unzip -j /opt/boot-__artifacts_version__.zip -d /opt nbi_install.sh
-            cd /opt
-            chmod +x nbi_install.sh
-            ./nbi_install.sh
+      user_data_format: SOFTWARE_CONFIG
+      user_data: { get_resource: nbi_vm_config }
+
+  nbi_vm_scripts:
+    type: OS::Heat::CloudConfig
+    properties:
+      cloud_config:
+        write_files:
+        - path: /opt/nbi_install.sh
+          permissions: '0755'
+          content: { get_file: cloud-config/nbi_install.sh }
+
+  nbi_vm_config:
+    type: OS::Heat::MultipartMime
+    properties:
+      parts:
+      - config: { get_resource: common_config_script }
+      - config: { get_resource: nbi_vm_scripts }
+      - config:
+          str_replace:
+            params:
+              __docker_version__: { get_param: nbi_docker }
+              __nbi_repo__: { get_param: nbi_repo }
+              __gerrit_branch__: { get_param: nbi_branch }
+              __sdc_ip_addr__: { get_param: sdc_ip_addr }
+              __aai1_ip_addr__: { get_param: aai1_ip_addr }
+              __so_ip_addr__: { get_param: so_ip_addr }
+            template: |
+              #!/bin/bash
+
+              # Create configuration files
+              echo "__docker_version__" > /opt/config/docker_version.txt
+              echo "__nbi_repo__" > /opt/config/remote_repo.txt
+              echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+              echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+              echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
+              echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
+
+              cd /opt
+              ./nbi_install.sh