Update set of Heat templates

Change-Id: I1179f37d91752dc83b8d1d6894c02a1f2c5a71b8
Signed-off-by: Marco Platania <platania@research.att.com>

10 files changed, 1496 insertions, 1827 deletions

diff --git a/heat/OpenECOMP/onap_openstack.env b/heat/OpenECOMP/onap_openstack.env
index 16a7396f..60e19d87 100644
--- a/heat/OpenECOMP/onap_openstack.env
+++ b/heat/OpenECOMP/onap_openstack.env
@@ -1,6 +1,10 @@
 parameters:
 
-  # Generic parameters used across all ONAP components
+  ##############################################
+  #                                            #
+  # Parameters used across all ONAP components #
+  #                                            #
+  ##############################################
 
   public_net_id: PUT YOUR NETWORK ID/NAME HERE
 
@@ -18,7 +22,7 @@ parameters:
 
   vm_base_name: vm1
 
-  key_name: ecomp_key
+  key_name: onap_key
 
   pub_key: PUT YOUR PUBLIC KEY HERE
 
@@ -32,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.0.0
+  artifacts_version: 1.1.0-SNAPSHOT
 
   docker_version: 1.0-STAGING-latest
 
@@ -44,48 +48,57 @@ parameters:
 
   openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
 
+  openstack_auth_method: password
+
   horizon_url: PUT THE HORIZON URL HERE
 
   keystone_url: PUT THE KEYSTONE URL HERE
 
+  cloud_env: openstack
 
-  # Network parameters
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf)
 
-  oam_network_cidr: 10.0.0.0/8
+  ######################
+  #                    #
+  # Network parameters #
+  #                    #
+  ######################
 
-  aai_ip_addr: 10.0.1.1
+  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
 
-  appc_ip_addr: 10.0.2.1
+  ### Private IP addresses ###
 
+  oam_network_cidr: 10.0.0.0/8
+  aai_ip_addr: 10.0.1.1
+  appc_ip_addr: 10.0.2.1
   dcae_ip_addr: 10.0.4.1
-
+  dcae_coll_ip_addr: 10.0.4.102
+  dcae_db_ip_addr: 10.0.4.101
+  dcae_hdp1_ip_addr: 10.0.4.103
+  dcae_hdp2_ip_addr: 10.0.4.104
+  dcae_hdp3_ip_addr: 10.0.4.105
   dns_ip_addr: 10.0.100.1
-
   mso_ip_addr: 10.0.5.1
-
   mr_ip_addr: 10.0.11.1
-
   policy_ip_addr: 10.0.6.1
-
   portal_ip_addr: 10.0.9.1
-
   robot_ip_addr: 10.0.10.1
-
   sdc_ip_addr: 10.0.3.1
-
   sdnc_ip_addr: 10.0.7.1
-
   vid_ip_addr: 10.0.8.1
 
+  ###########################
+  #                         #
+  # Parameters used by DCAE #
+  #                         #
+  ###########################
 
-  # Parameters for DCAE instantiation
+  dcae_base_environment: 1-NIC-FLOATING-IPS
 
-  dcae_zone: z1
+  dcae_zone: ZONE
 
-  dcae_state: os
+  dcae_state: STATE
 
-  nexus_repo_root: https://nexus.onap.org  
+  nexus_repo_root: https://nexus.onap.org
 
   nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
 
@@ -93,3 +106,4 @@ parameters:
 
   gitlab_branch: master
 
+  dcae_code_version: 1.0.0
\ No newline at end of file
diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml
index 9d72fad2..701692d2 100644
--- a/heat/OpenECOMP/onap_openstack.yaml
+++ b/heat/OpenECOMP/onap_openstack.yaml
@@ -1,6 +1,6 @@
 heat_template_version: 2015-10-15
 
-description: Heat template to install ONAP components on Mitaka OpenStack
+description: Heat template to install ONAP components
 
 ##############
 #            #
@@ -10,7 +10,12 @@ description: Heat template to install ONAP components on Mitaka OpenStack
 
 parameters:
 
-  # Generic parameters used across all ONAP components
+  ##############################################
+  #                                            #
+  # Parameters used across all ONAP components #
+  #                                            #
+  ##############################################
+  
   public_net_id:
     type: string
     description: Public network for floating IP address allocation
@@ -82,7 +87,7 @@ parameters:
 
   dmaap_topic:
     type: string
-    description: DmaaP Topic name
+    description: DMaaP Topic name
 
   openstack_tenant_id:
     type: string
@@ -92,6 +97,10 @@ parameters:
     type: string
     description: Openstack username
 
+  openstack_auth_method:
+    type: string
+    description: Openstack authentication method (password VS. api-key)
+
   openstack_api_key:
     type: string
     description: Openstack API Key
@@ -104,18 +113,28 @@ parameters:
     type: string
     description: URL of Openstack Keystone
 
-  # Network parameters
+  cloud_env:
+    type: string
+    description: Cloud Provider Name
+
+  ######################
+  #                    #
+  # Network parameters #
+  #                    #
+  ######################
+  
   external_dns:
     type: comma_delimited_list
     description: External DNS for OAM ONAP network
 
+  ### Private IP addresses ###
   oam_network_cidr:
     type: string
     description: CIDR of the OAM ONAP network
 
   aai_ip_addr:
     type: string
-    description: A&AI IP Address
+    description: AAI IP Address
 
   appc_ip_addr:
     type: string
@@ -124,6 +143,26 @@ parameters:
   dcae_ip_addr:
     type: string
     description: DCAE IP Address
+ 
+  dcae_coll_ip_addr:
+    type: string
+    description: DCAE Collector IP Address
+
+  dcae_db_ip_addr:
+    type: string
+    description: DCAE Database IP Address
+
+  dcae_hdp1_ip_addr:
+    type: string
+    description: Hadoop VM1 IP Address
+
+  dcae_hdp2_ip_addr:
+    type: string
+    description: Hadoop VM2 IP Address
+
+  dcae_hdp3_ip_addr:
+    type: string
+    description: Hadoop VM3 IP Address
 
   dns_ip_addr:
     type: string
@@ -161,7 +200,17 @@ parameters:
     type: string
     description: VID IP Address
 
-  # Parameters for DCAE instantiation
+
+  ###########################
+  #                         #
+  # Parameters used by DCAE #
+  #                         #
+  ###########################
+
+  dcae_base_environment:
+    type: string
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+
   dcae_zone:
     type: string
     description: DCAE Zone to use in VM names created by DCAE controller
@@ -185,6 +234,10 @@ parameters:
   gitlab_branch:
     type: string
     description: Branch of the Gitlab repository
+    
+  dcae_code_version:
+    type: string
+    description: DCAE Code Version Number
 
 
 #############
@@ -204,12 +257,12 @@ resources:
   vm_key:
     type: OS::Nova::KeyPair
     properties:
-      name: 
+      name:
         str_replace:
           template: base_rand
           params:
             base: { get_param: key_name }
-            rand: { get_resource: random-str }         
+            rand: { get_resource: random-str }
       public_key: { get_param: pub_key }
       save_private_key: false
 
@@ -218,7 +271,7 @@ resources:
   oam_ecomp:
     type: OS::Neutron::Net
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -227,7 +280,7 @@ resources:
   oam_ecomp_subnet:
     type: OS::Neutron::Subnet
     properties:
-      name: 
+      name:
         str_replace:
           template: oam_ecomp_rand
           params:
@@ -286,6 +339,7 @@ resources:
             __aai_ip_addr__: { get_param: aai_ip_addr }
             __appc_ip_addr__: { get_param: appc_ip_addr }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
             __mso_ip_addr__: { get_param: mso_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
@@ -294,62 +348,36 @@ resources:
             __sdc_ip_addr__: { get_param: sdc_ip_addr }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
+            __cloud_env__: { get_param: cloud_env }
 
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk bind9 bind9utils bind9-doc ntp ntpdate
-
-            # Download script
-            mkdir /etc/bind/zones
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/bind_zones -o /etc/bind/zones/db.simpledemo.openecomp.org
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/bind_options -o /etc/bind/named.conf.options
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/named.conf.local -o /etc/bind/named.conf.local
-
-            # Configure bind
-            #NETMASK=$(echo "__oam_network_cidr__" | cut -d"/" -f2)
-            #if [[ $NETMASK == "8" ]]
-            #then
-            #  ADDR=$(echo "__dns_ip_addr__" | cut -d"." -f1)
-            #elif [[ $NETMASK == "16" ]]
-            #then
-            #  ADDR=$(echo "__dns_ip_addr__" | cut -d"." -f1).$(echo "__dns_ip_addr__" | cut -d"." -f2)
-            #elif [[ $NETMASK == "24" ]]
-            #then
-            #  ADDR=$(echo "__dns_ip_addr__" | cut -d"." -f1).$(echo "__dns_ip_addr__" | cut -d"." -f2).$(echo "__dns_ip_addr__" | cut -d"." -f3)
-            #fi
-
-            #sed -i "s/netmask/$ADDR\/$NETMASK/g" /etc/bind/named.conf.options
-            sed -i "s/dns_ip_addr/"__dns_ip_addr__"/g" /etc/bind/named.conf.options
-
-            A=$(echo "__dcae_ip_addr__" | cut -d"." -f1)
-            B=$(echo "__dcae_ip_addr__" | cut -d"." -f2)
-            C=$(echo "__dcae_ip_addr__" | cut -d"." -f3)
-            sed -i "s/aai_ip_addr/"__aai_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/appc_ip_addr/"__appc_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/dcae_ip_addr/"__dcae_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/dns_ip_addr/"__dns_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/mso_ip_addr/"__mso_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/mr_ip_addr/"__mr_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/policy_ip_addr/"__policy_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/portal_ip_addr/"__portal_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/robot_ip_addr/"__robot_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/sdc_ip_addr/"__sdc_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/sdnc_ip_addr/"__sdnc_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/vid_ip_addr/"__vid_ip_addr__"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-            sed -i "s/dcae_coll_ip_addr/"$A.$B.$C"/g" /etc/bind/zones/db.simpledemo.openecomp.org
-
-            modprobe ip_gre
-            sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
-
-            # Restart bind to pick up configuration changes
-            service bind9 restart
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__aai_ip_addr__" > /opt/config/aai_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_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
+            echo "__mso_ip_addr__" > /opt/config/mso_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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+            cd /opt
+            chmod +x dns_install.sh
+            ./dns_install.sh
 
 
   # A&AI instantiation
@@ -358,7 +386,7 @@ resources:
     properties:
       network: { get_resource: oam_ecomp }
       fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai_ip_addr }}]
-      
+
   aai_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
@@ -367,7 +395,6 @@ resources:
 
   aai_vm:
     type: OS::Nova::Server
-    depends_on: sdc_vm
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
@@ -390,58 +417,30 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
             __docker_version__: { get_param: docker_version }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-            
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
-            
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_vm_init.sh -o /opt/aai_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_serv.sh -o /opt/aai_serv.sh
-            chmod +x /opt/aai_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-
-            mkdir /opt/openecomp
-            mkdir /opt/openecomp/aai
-            mkdir /opt/openecomp/aai/logs
-            mkdir /opt/openecomp/aai/data
-            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
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            cd /opt
+            chmod +x aai_install.sh
+            ./aai_install.sh
 
 
   # MSO instantiation
@@ -487,70 +486,32 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__keystone_url__" > /opt/config/keystone.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 "__cloud_env__" > /opt/config/cloud_env.txt
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_vm_init.sh -o /opt/mso_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_serv.sh -o /opt/mso_serv.sh
-            chmod +x /opt/mso_vm_init.sh
-            chmod +x /opt/mso_serv.sh
-            mv /opt/mso_serv.sh /etc/init.d
-            update-rc.d mso_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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
-            service docker start
-
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/mso/docker-config.git test_lab
-            MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
-            echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
-
-            # Rename network interface
-            sed -i 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g' /etc/default/grub
-            grub-mkconfig -o /boot/grub/grub.cfg
-            sed -i 's/ens3/eth0/g' /etc/network/interfaces.d/*.cfg
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Disable cloud-init for networking on reboot
-            echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x mso_install.sh
+            ./mso_install.sh
 
 
   # Message Router instantiation
@@ -590,55 +551,26 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-            
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-            
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_vm_init.sh -o /opt/mr_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_serv.sh -o /opt/mr_serv.sh
-            chmod +x /opt/mr_vm_init.sh
-            chmod +x /opt/mr_serv.sh
-            mv /opt/mr_serv.sh /etc/init.d
-            update-rc.d mr_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
-            
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x mr_install.sh
+            ./mr_install.sh
 
 
   # Robot Framework instantiation
@@ -653,7 +585,7 @@ resources:
     properties:
       floating_network_id: { get_param: public_net_id }
       port_id: { get_resource: robot_private_port }
-
+ 
   robot_vm:
     type: OS::Nova::Server
     properties:
@@ -683,12 +615,10 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
@@ -701,57 +631,15 @@ resources:
             echo "__openstack_region__" > /opt/config/region.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__docker_version__" > /opt/config/docker_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
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-            echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_vm_init.sh -o /opt/robot_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_serv.sh -o /opt/robot_serv.sh
-            chmod +x /opt/robot_vm_init.sh
-            chmod +x /opt/robot_serv.sh
-            mv /opt/robot_serv.sh /etc/init.d
-            update-rc.d robot_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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
-            service docker start
- 
-            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
-
-            # Execute RobotETE-specific instructions: create share folder to run as a docker volume
-            mkdir -p /opt/eteshare/logs
-            mkdir -p /opt/eteshare/config
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/testsuite/properties.git testsuite/properties
-
-            # Rename network interface
-            sed -i 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g' /etc/default/grub
-            grub-mkconfig -o /boot/grub/grub.cfg
-            sed -i 's/ens3/eth0/g' /etc/network/interfaces.d/*.cfg
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Disable cloud-init for networking on reboot
-            echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x robot_install.sh
+            ./robot_install.sh
 
 
   # VID instantiation
@@ -792,58 +680,29 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk make git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_vm_init.sh -o /opt/vid_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_serv.sh -o /opt/vid_serv.sh
-            chmod +x /opt/vid_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/vid.git
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
-
+            chmod +x vid_install.sh
+            ./vid_install.sh
 
+ 
   # SDN-C instantiation
   sdnc_private_port:
     type: OS::Neutron::Port
@@ -882,56 +741,27 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_serv.sh -o /opt/sdnc_serv.sh
-            chmod +x /opt/sdnc_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/sdnc/oam.git sdnc
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x sdnc_install.sh
+            ./sdnc_install.sh
 
 
   # SDC instantiation
@@ -953,13 +783,6 @@ resources:
       name: vol1-sdc-data
       size: 100
 
-  sdc_volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: sdc_volume_data }
-      instance_uuid: { get_resource: sdc_vm }
-      mountpoint: /dev/vdb
-
   sdc_vm:
     type: OS::Nova::Server
     properties:
@@ -973,6 +796,9 @@ resources:
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: sdc_private_port }
+      block_device_mapping:
+        - device_name: /dev/vdb
+          volume_id: {get_resource: sdc_volume_data}
       user_data_format: RAW
       user_data:
         str_replace:
@@ -988,91 +814,30 @@ resources:
             __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__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 "__cloud_env__" > /opt/config/cloud_env.txt
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_serv.sh -o /opt/asdc_serv.sh
-            chmod +x /opt/asdc_vm_init.sh
-            chmod +x /opt/asdc_serv.sh
-            mv /opt/asdc_serv.sh /etc/init.d
-            update-rc.d asdc_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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
-            service docker start
-            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
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
-            sfdisk /dev/vdb < /opt/asdc_ext_volume_partitions.txt
-            mkfs -t ext4 /dev/vdb1
-            mkdir -p /data
-            mount /dev/vdb1 /data
-            echo "/dev/vdb1  /data           ext4    errors=remount-ro,noatime,barrier=0 0       1" >> /etc/fstab
-
-            # Run SDC-specific instructions
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
             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
-
-            # Clone Gerrit repository
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/sdc.git
-
-            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
-
-            # Rename network interface
-            sed -i 's/GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"net.ifnames=0 biosdevname=0\"/g' /etc/default/grub
-            grub-mkconfig -o /boot/grub/grub.cfg
-            sed -i 's/ens3/eth0/g' /etc/network/interfaces.d/*.cfg
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Disable cloud-init for networking on reboot
-            echo 'network: {config: disabled}' >> /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x asdc_install.sh
+            ./asdc_install.sh
 
 
   # PORTAL instantiation
@@ -1114,57 +879,28 @@ resources:
             __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__cloud_env__" > /opt/config/cloud_env.txt
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_vm_init.sh -o /opt/portal_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_serv.sh -o /opt/portal_serv.sh
-            chmod +x /opt/portal_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-            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
-
-            # Clone Gerrit repository
-            mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/portal.git
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x portal_install.sh
+            ./portal_install.sh
 
 
   # DCAE Controller instantiation
@@ -1194,7 +930,7 @@ resources:
       networks:
         - port: { get_resource: dcae_c_private_port }
       user_data_format: RAW
-      user_data: 
+      user_data:
         str_replace:
           params:
             __nexus_repo__: { get_param: nexus_repo }
@@ -1211,94 +947,71 @@ resources:
             __openstack_private_network_name__: { get_attr: [oam_ecomp, name] }
             __openstack_user__: { get_param: openstack_username }
             __openstack_password__: { get_param: openstack_api_key }
+            __openstack_auth_method__: { get_param: openstack_auth_method }
             __key_name__: { get_param: key_name }
             __rand_str__: { get_resource: random-str }
             __pub_key__: { get_param: pub_key }
             __nexus_repo_root__: { get_param: nexus_repo_root }
             __openstack_region__: { get_param: openstack_region }
-            __horizon_url__ : { get_param: horizon_url }
-            __keystone_url__ : { get_param: keystone_url }
+            __horizon_url__: { get_param: horizon_url }
+            __keystone_url__: { get_param: keystone_url }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __dcae_code_version__: { get_param: dcae_code_version }
+            __cloud_env__: { get_param: cloud_env }
+            __public_net_id__: { get_param: public_net_id }
+            __dcae_base_environment__: { get_param: dcae_base_environment }
+            __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
+            __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr }
+            __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr }
+            __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr }
+            __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt
             echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk make git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_serv.sh -o /opt/dcae_serv.sh
-            chmod +x /opt/dcae_vm_init.sh
-            chmod +x /opt/dcae_serv.sh
-            mv /opt/dcae_serv.sh /etc/init.d
-            update-rc.d dcae_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-            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
-
-            # Clone Gerrit repository
+            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 "__dcae_zone__" > /opt/config/dcae_zone.txt
+            echo "__dcae_state__" > /opt/config/dcae_state.txt
+            echo "__tenant_id__" > /opt/config/tenant_id.txt
+            echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt
+            echo "__openstack_user__" > /opt/config/openstack_user.txt
+            echo "__openstack_password__" > /opt/config/openstack_password.txt
+            echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt
+            echo "__key_name__" > /opt/config/key_name.txt
+            echo "__rand_str__" > /opt/config/rand_str.txt
+            echo "__pub_key__" > /opt/config/pub_key.txt
+            echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt
+            echo "__openstack_region__" > /opt/config/openstack_region.txt
+            echo "__horizon_url__" > /opt/config/horizon_url.txt
+            echo "__keystone_url__" > /opt/config/keystone_url.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__public_net_id__" > /opt/config/public_net_id.txt
+            echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt
+            echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt
+            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+            echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
+            echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt
+            echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt
+            echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt
+            echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/controller.git dcae-startup-vm-controller
-
-            # DCAE Controller specific deployment
-            cd /opt/dcae-startup-vm-controller
-            mkdir -p /opt/app/dcae-controller
-            cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-            ZONE: __dcae_zone__
-            STATE: __dcae_state__
-            DCAE-VERSION: __artifacts_version__
-            HORIZON-URL: __horizon_url__/__openstack_user__
-            KEYSTONE-URL: __keystone_url__
-            OPENSTACK-TENANT-ID: __tenant_id__
-            OPENSTACK-TENANT-NAME: OPEN-ECOMP
-            OPENSTACK-REGION: __openstack_region__
-            OPENSTACK-PRIVATE-NETWORK: __openstack_private_network_name__
-            OPENSTACK-USER: __openstack_user__
-            OPENSTACK-PASSWORD: __openstack_password__
-            OPENSTACK-KEYNAME: __key_name_____rand_str___dcae
-            OPENSTACK-PUBKEY: __pub_key__
-
-            NEXUS-URL-ROOT: __nexus_repo_root__
-            NEXUS-USER: __nexus_username__
-            NEXUS-PASSWORD: __nexus_password__
-            NEXUS-URL-SNAPSHOTS: __nexus_url_snapshots__
-            NEXUS-RAWURL: __nexus_repo__
-
-            DOCKER-REGISTRY: __nexus_docker_repo__
-
-            GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
-            EOF_CONFIG
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x dcae_install.sh
+            ./dcae_install.sh
 
 
   # Policy Engine instantiation
@@ -1340,56 +1053,28 @@ resources:
             __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_vm_init.sh -o /opt/policy_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_serv.sh -o /opt/policy_serv.sh
-            chmod +x /opt/policy_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/policy/docker.git policy
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
+            chmod +x policy_install.sh
+            ./policy_install.sh
 
 
   # APP-C instantiation
@@ -1431,54 +1116,25 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
 
-            hn=`hostname`
-            echo 127.0.0.1 $hn >> /etc/hosts
-
             # Create configuration files
             mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__cloud_env__" > /opt/config/cloud_env.txt
 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-7-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/docker_key.txt -o /opt/config/docker_key.txt
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_vm_init.sh -o /opt/appc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_serv.sh -o /opt/appc_serv.sh
-            chmod +x /opt/appc_vm_init.sh
-            chmod +x /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
-            DOCKER_KEY=$(cat /opt/config/docker_key.txt)
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys $DOCKER_KEY
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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
-            service docker start
-
-            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
-
-            # Clone Gerrit repository
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
             cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/appc/deployment.git appc
-
-            # DNS/GW IP address configuration
-            echo "nameserver __dns_ip_addr__" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Reboot the VM to pick up configuration changes
-            reboot
\ No newline at end of file
+            chmod +x appc_install.sh
+            ./appc_install.sh
\ No newline at end of file
diff --git a/heat/OpenECOMP/onap_openstack_RC.env b/heat/OpenECOMP/onap_openstack_float.env
index 5a14e877..1dfc7f81 100644
--- a/heat/OpenECOMP/onap_openstack_RC.env
+++ b/heat/OpenECOMP/onap_openstack_float.env
@@ -113,7 +113,7 @@ parameters:
   #                         #
   ###########################
 
-  dcae_base_environment: 2-NIC
+  dcae_base_environment: 1-NIC-FLOATING-IPS
 
   dcae_zone: ZONE
 
diff --git a/heat/OpenECOMP/onap_openstack_RC.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 024dd2f9..024dd2f9 100644
--- a/heat/OpenECOMP/onap_openstack_RC.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.env b/heat/OpenECOMP/onap_openstack_nofloat.env
new file mode 100644
index 00000000..49b68e3f
--- /dev/null
+++ b/heat/OpenECOMP/onap_openstack_nofloat.env
@@ -0,0 +1,107 @@
+parameters:
+
+  ##############################################
+  #                                            #
+  # Parameters used across all ONAP components #
+  #                                            #
+  ##############################################
+
+  public_net_id: PUT YOUR NETWORK ID/NAME HERE
+
+  ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
+
+  ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
+
+  flavor_small: PUT THE SMALL FLAVOR NAME HERE
+
+  flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
+
+  flavor_large: PUT THE LARGE FLAVOR NAME HERE
+
+  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
+
+  vm_base_name: vm1
+
+  key_name: onap_key
+
+  pub_key: PUT YOUR PUBLIC KEY HERE
+
+  nexus_repo: https://nexus.onap.org/content/sites/raw
+
+  nexus_docker_repo: nexus3.onap.org:10001
+
+  nexus_username: docker 
+
+  nexus_password: docker
+
+  dmaap_topic: AUTO
+
+  artifacts_version: 1.1.0-SNAPSHOT
+
+  docker_version: 1.0-STAGING-latest
+
+  gerrit_branch: release-1.0.0
+
+  openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
+
+  openstack_username: PUT YOUR OPENSTACK USERNAME HERE
+
+  openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
+
+  openstack_auth_method: password
+
+  horizon_url: PUT THE HORIZON URL HERE
+
+  keystone_url: PUT THE KEYSTONE URL HERE
+
+  cloud_env: openstack_nofloat
+
+
+  ######################
+  #                    #
+  # Network parameters #
+  #                    #
+  ######################
+
+  oam_network_cidr: 10.0.0.0/8
+  aai_ip_addr: 10.0.1.1
+  appc_ip_addr: 10.0.2.1
+  dcae_ip_addr: 10.0.4.1
+  dcae_coll_ip_addr: 10.0.4.102
+  dcae_db_ip_addr: 10.0.4.101
+  dcae_hdp1_ip_addr: 10.0.4.103
+  dcae_hdp2_ip_addr: 10.0.4.104
+  dcae_hdp3_ip_addr: 10.0.4.105
+  dns_ip_addr: 10.0.100.1
+  mso_ip_addr: 10.0.5.1
+  mr_ip_addr: 10.0.11.1
+  policy_ip_addr: 10.0.6.1
+  portal_ip_addr: 10.0.9.1
+  robot_ip_addr: 10.0.10.1
+  sdc_ip_addr: 10.0.3.1
+  sdnc_ip_addr: 10.0.7.1
+  vid_ip_addr: 10.0.8.1
+
+
+  ###########################
+  #                         #
+  # Parameters used by DCAE #
+  #                         #
+  ###########################
+
+  dcae_base_environment: 2-NIC
+
+  dcae_zone: bm01
+
+  dcae_state: nj
+
+  nexus_repo_root: https://nexus.onap.org   
+
+  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
+
+  openstack_region: RegionOne
+
+  gitlab_branch: master
+
+  dcae_code_version: 1.0.0
+
diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml
new file mode 100644
index 00000000..50530a6e
--- /dev/null
+++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml
@@ -0,0 +1,1106 @@
+heat_template_version: 2013-05-23
+
+description: Heat template to install ONAP components
+
+##############
+#            #
+# PARAMETERS #
+#            #
+##############
+
+parameters:
+
+  ##############################################
+  #                                            #
+  # Parameters used across all ONAP components #
+  #                                            #
+  ##############################################
+  
+  public_net_id:
+    type: string
+    description: Public network for floating IP address allocation
+
+  ubuntu_1404_image:
+    type: string
+    description: Name of the Ubuntu 14.04 image
+
+  ubuntu_1604_image:
+    type: string
+    description: Name of the Ubuntu 16.04 image
+
+  flavor_small:
+    type: string
+    description: Name of the Small Flavor supported by the cloud provider
+
+  flavor_medium:
+    type: string
+    description: Name of the Medium Flavor supported by the cloud provider
+
+  flavor_large:
+    type: string
+    description: Name of the Large Flavor supported by the cloud provider
+
+  flavor_xlarge:
+    type: string
+    description: Name of the Extra Large Flavor supported by the cloud provider
+
+  vm_base_name:
+    type: string
+    description: Base name of ONAP VMs
+
+  key_name:
+    type: string
+    description: Public/Private key pair name
+
+  pub_key:
+    type: string
+    description: Public key to be installed on the compute instance
+
+  nexus_repo:
+    type: string
+    description: Complete URL for the Nexus repository.
+
+  nexus_docker_repo:
+    type: string
+    description: Complete URL for the Nexus repository for docker images.
+
+  nexus_username:
+    type: string
+    description: Nexus Repository username
+
+  nexus_password:
+    type: string
+    description: Nexus Repository Password
+
+  artifacts_version:
+    type: string
+    description: Artifacts version of ONAP components
+
+  docker_version:
+    type: string
+    label: Version number of ONAP docker images
+
+  gerrit_branch:
+    type: string
+    label: Gerrit code branch
+    description: Gerrit branch where to download the code from
+
+  dmaap_topic:
+    type: string
+    description: DMaaP Topic name
+
+  openstack_tenant_id:
+    type: string
+    description: Openstack tenant ID
+
+  openstack_username:
+    type: string
+    description: Openstack username
+
+  openstack_auth_method:
+    type: string
+    description: Openstack authentication method (password VS. api-key)
+
+  openstack_api_key:
+    type: string
+    description: Openstack API Key
+
+  horizon_url:
+    type: string
+    description: URL of Openstack Horizon
+
+  keystone_url:
+    type: string
+    description: URL of Openstack Keystone
+
+  cloud_env:
+    type: string
+    description: Cloud Provider Name
+
+
+  ######################
+  #                    #
+  # Network parameters #
+  #                    #
+  ######################
+
+  oam_network_cidr:
+    type: string
+    description: CIDR of the OAM ONAP network
+
+  aai_ip_addr:
+    type: string
+    description: AAI IP Address
+
+  appc_ip_addr:
+    type: string
+    description: APP-C IP Address
+
+  dcae_ip_addr:
+    type: string
+    description: DCAE IP Address
+ 
+  dcae_coll_ip_addr:
+    type: string
+    description: DCAE Collector IP Address
+
+  dcae_db_ip_addr:
+    type: string
+    description: DCAE Database IP Address
+
+  dcae_hdp1_ip_addr:
+    type: string
+    description: Hadoop VM1 IP Address
+
+  dcae_hdp2_ip_addr:
+    type: string
+    description: Hadoop VM2 IP Address
+
+  dcae_hdp3_ip_addr:
+    type: string
+    description: Hadoop VM3 IP Address
+
+  dns_ip_addr:
+    type: string
+    description: DNS IP Address
+
+  mso_ip_addr:
+    type: string
+    description: MSO IP Address
+
+  mr_ip_addr:
+    type: string
+    description: Message Router IP Address
+
+  policy_ip_addr:
+    type: string
+    description: Policy Engine IP Address
+
+  portal_ip_addr:
+    type: string
+    description: Portal IP Address
+
+  robot_ip_addr:
+    type: string
+    description: Robot Framework IP Address
+
+  sdc_ip_addr:
+    type: string
+    description: SDC IP Address
+
+  sdnc_ip_addr:
+    type: string
+    description: SDN-C IP Address
+
+  vid_ip_addr:
+    type: string
+    description: VID IP Address
+
+
+  ###########################
+  #                         #
+  # Parameters used by DCAE #
+  #                         #
+  ###########################
+
+  dcae_base_environment:
+    type: string
+    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+
+  dcae_zone:
+    type: string
+    description: DCAE Zone to use in VM names created by DCAE controller
+
+  dcae_state:
+    type: string
+    description: DCAE State to use in VM names created by DCAE controller
+
+  nexus_repo_root:
+    type: string
+    description: Root URL of Nexus repository
+
+  nexus_url_snapshot:
+    type: string
+    description: Snapshot of Maven repository for DCAE deployment
+
+  openstack_region:
+    type: string
+    description: Region where the DCAE controller will spin the VMs
+
+  gitlab_branch:
+    type: string
+    description: Branch of the Gitlab repository
+    
+  dcae_code_version:
+    type: string
+    description: DCAE Code Version Number
+
+
+#############
+#           #
+# RESOURCES #
+#           #
+#############
+
+resources:
+  random-str:
+    type: OS::Heat::RandomString
+    properties:
+      length: 4
+
+
+  # Public key used to access ONAP components
+  vm_key:
+    type: OS::Nova::KeyPair
+    properties:
+      name:
+        str_replace:
+          template: base_rand
+          params:
+            base: { get_param: key_name }
+            rand: { get_resource: random-str }
+      public_key: { get_param: pub_key }
+      save_private_key: false
+
+
+  # ONAP management private network
+  oam_ecomp:
+    type: OS::Neutron::Net
+    properties:
+      name:
+        str_replace:
+          template: oam_ecomp_rand
+          params:
+            rand: { get_resource: random-str }
+
+  oam_ecomp_subnet:
+    type: OS::Neutron::Subnet
+    properties:
+      name:
+        str_replace:
+          template: oam_ecomp_rand
+          params:
+            rand: { get_resource: random-str }
+      network_id: { get_resource: oam_ecomp }
+      cidr: { get_param: oam_network_cidr }
+
+
+  # DNS Server instantiation
+  dns_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: dns_ip_addr }}]
+
+  dns_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_small }
+      name: 
+        str_replace:
+          template: base-dns-server
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: dns_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_repo }
+            __artifacts_version__: { get_param: artifacts_version }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __aai_ip_addr__: { get_param: aai_ip_addr }
+            __appc_ip_addr__: { get_param: appc_ip_addr }
+            __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
+            __mso_ip_addr__: { get_param: mso_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 }
+            __cloud_env__: { get_param: cloud_env }
+
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__aai_ip_addr__" > /opt/config/aai_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_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
+            echo "__mso_ip_addr__" > /opt/config/mso_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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+            cd /opt
+            chmod +x dns_install.sh
+            ./dns_install.sh
+
+
+  # A&AI instantiation
+  aai_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai_ip_addr }}]
+
+  aai_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_xlarge }
+      name: 
+        str_replace:
+          template: base-aai
+          params:
+            base: { get_param: vm_base_name }      
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: aai_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __aai_ip_addr__: { get_param: aai_ip_addr }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__aai_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            cd /opt
+            chmod +x aai_install.sh
+            ./aai_install.sh
+
+
+  # MSO instantiation
+  mso_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: mso_ip_addr }}]
+
+  mso_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_large }
+      name: 
+        str_replace:
+          template: base-mso
+          params:
+            base: { get_param: vm_base_name }      
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: mso_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __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 }
+            __mso_ip_addr__: { get_param: mso_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__mso_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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 "__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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh
+            cd /opt
+            chmod +x mso_install.sh
+            ./mso_install.sh
+
+
+  # Message Router instantiation
+  mrouter_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: mr_ip_addr }}]
+
+  mrouter_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_large }
+      name: 
+        str_replace: 
+          template: base-message-router
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: mrouter_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__mr_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
+            cd /opt
+            chmod +x mr_install.sh
+            ./mr_install.sh
+
+
+  # Robot Framework instantiation
+  robot_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: robot_ip_addr }}]
+ 
+  robot_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_small }
+      name: 
+        str_replace: 
+          template: base-robot
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: robot_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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_ecomp, name] }
+            __openstack_username__: { get_param: openstack_username }
+            __openstack_api_key__: { get_param : openstack_api_key }
+            __artifacts_version__: { get_param: artifacts_version }
+            __openstack_region__: { get_param: openstack_region }
+            __robot_ip_addr__: { get_param: robot_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_repo__" > /opt/config/nexus_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_region__" > /opt/config/region.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__robot_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
+            cd /opt
+            chmod +x robot_install.sh
+            ./robot_install.sh
+
+
+  # VID instantiation
+  vid_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: vid_ip_addr }}]
+
+  vid_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_medium }
+      name: 
+        str_replace: 
+          template: base-vid
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: vid_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __vid_ip_addr__: { get_param: vid_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__vid_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
+            cd /opt
+            chmod +x vid_install.sh
+            ./vid_install.sh
+
+ 
+  # SDN-C instantiation
+  sdnc_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: sdnc_ip_addr }}]
+
+  sdnc_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_large }
+      name: 
+        str_replace: 
+          template: base-sdnc
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: sdnc_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__sdnc_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
+            cd /opt
+            chmod +x sdnc_install.sh
+            ./sdnc_install.sh
+
+
+  # SDC instantiation
+  sdc_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
+
+  sdc_volume_data:
+    type: OS::Cinder::Volume
+    properties:
+      name: vol1-sdc-data
+      size: 100
+
+#  sdc_volume_attachment:
+#    type: OS::Cinder::VolumeAttachment
+#    properties:
+#      volume_id: { get_resource: sdc_volume_data }
+#      instance_uuid: { get_resource: sdc_vm }
+#      mountpoint: /dev/vdb
+
+  sdc_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_xlarge }
+      name:
+        str_replace:
+          template: base-sdc
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: sdc_private_port }
+      block_device_mapping:
+        - device_name: /dev/vdb
+          volume_id: { get_resource: sdc_volume_data }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__sdc_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh
+            cd /opt
+            chmod +x asdc_install.sh
+            ./asdc_install.sh
+
+
+  # PORTAL instantiation
+  portal_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: portal_ip_addr }}]
+
+  portal_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_large }
+      name: 
+        str_replace: 
+          template: base-portal
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: portal_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __portal_ip_addr__: { get_param: portal_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__portal_ip_addr__" > /opt/config/local_ip_addr.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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
+            cd /opt
+            chmod +x portal_install.sh
+            ./portal_install.sh
+
+
+  # DCAE Controller instantiation
+  dcae_c_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
+
+  dcae_c_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_medium }
+      name: 
+        str_replace: 
+          template: base-dcae-controller
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: dcae_c_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
+            __gitlab_branch__: { get_param: gitlab_branch }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __dcae_zone__: { get_param: dcae_zone }
+            __dcae_state__: { get_param: dcae_state }
+            __artifacts_version__: { get_param: artifacts_version }
+            __tenant_id__: { get_param: openstack_tenant_id }
+            __openstack_private_network_name__: { get_attr: [oam_ecomp, name] }
+            __openstack_user__: { get_param: openstack_username }
+            __openstack_password__: { get_param: openstack_api_key }
+            __openstack_auth_method__: { get_param: openstack_auth_method }
+            __key_name__: { get_param: key_name }
+            __rand_str__: { get_resource: random-str }
+            __pub_key__: { get_param: pub_key }
+            __nexus_repo_root__: { get_param: nexus_repo_root }
+            __openstack_region__: { get_param: openstack_region }
+            __horizon_url__: { get_param: horizon_url }
+            __keystone_url__: { get_param: keystone_url }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __dcae_code_version__: { get_param: dcae_code_version }
+            __cloud_env__: { get_param: cloud_env }
+            __public_net_id__: { get_param: public_net_id }
+            __dcae_base_environment__: { get_param: dcae_base_environment }
+            __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
+            __dcae_db_ip_addr__: { get_param: dcae_db_ip_addr }
+            __dcae_hdp1_ip_addr__: { get_param: dcae_hdp1_ip_addr }
+            __dcae_hdp2_ip_addr__: { get_param: dcae_hdp2_ip_addr }
+            __dcae_hdp3_ip_addr__: { get_param: dcae_hdp3_ip_addr }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__nexus_url_snapshots__" > /opt/config/nexus_url_snapshots.txt
+            echo "__gitlab_branch__" > /opt/config/gitlab_branch.txt
+            echo "__docker_version__" > /opt/config/docker_version.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 "__dcae_zone__" > /opt/config/dcae_zone.txt
+            echo "__dcae_state__" > /opt/config/dcae_state.txt
+            echo "__tenant_id__" > /opt/config/tenant_id.txt
+            echo "__openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt
+            echo "__openstack_user__" > /opt/config/openstack_user.txt
+            echo "__openstack_password__" > /opt/config/openstack_password.txt
+            echo "__openstack_auth_method__" > /opt/config/openstack_auth_method.txt
+            echo "__key_name__" > /opt/config/key_name.txt
+            echo "__rand_str__" > /opt/config/rand_str.txt
+            echo "__pub_key__" > /opt/config/pub_key.txt
+            echo "__nexus_repo_root__" > /opt/config/nexus_repo_root.txt
+            echo "__openstack_region__" > /opt/config/openstack_region.txt
+            echo "__horizon_url__" > /opt/config/horizon_url.txt
+            echo "__keystone_url__" > /opt/config/keystone_url.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__public_net_id__" > /opt/config/public_net_id.txt
+            echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt
+            echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt
+            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+            echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
+            echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt
+            echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt
+            echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt
+            echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh
+            cd /opt
+            chmod +x dcae_install.sh
+            ./dcae_install.sh
+
+
+  # Policy Engine instantiation
+  policy_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: policy_ip_addr }}]
+
+  policy_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_xlarge }
+      name: 
+        str_replace: 
+          template: base-policy
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: policy_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __policy_ip_addr__: { get_param: policy_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__policy_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
+            cd /opt
+            chmod +x policy_install.sh
+            ./policy_install.sh
+
+
+  # APP-C instantiation
+  appc_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: appc_ip_addr }}]
+
+  appc_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_large }
+      name: 
+        str_replace: 
+          template: base-appc
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - network: { get_param: public_net_id }
+        - port: { get_resource: appc_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_repo__: { get_param: nexus_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 }
+            __appc_ip_addr__: { get_param: appc_ip_addr }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __docker_version__: { get_param: docker_version }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __cloud_env__: { get_param: cloud_env }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_repo__" > /opt/config/nexus_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 "__appc_ip_addr__" > /opt/config/local_ip_addr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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 "__cloud_env__" > /opt/config/cloud_env.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
+            cd /opt
+            chmod +x appc_install.sh
+            ./appc_install.sh
\ No newline at end of file
diff --git a/heat/OpenECOMP/onap_rackspace_RC.env b/heat/OpenECOMP/onap_rackspace.env
index 3a148ac9..3a148ac9 100644
--- a/heat/OpenECOMP/onap_rackspace_RC.env
+++ b/heat/OpenECOMP/onap_rackspace.env
diff --git a/heat/OpenECOMP/onap_rackspace_RC.yaml b/heat/OpenECOMP/onap_rackspace.yaml
index d92484a1..d92484a1 100644
--- a/heat/OpenECOMP/onap_rackspace_RC.yaml
+++ b/heat/OpenECOMP/onap_rackspace.yaml
diff --git a/heat/OpenECOMP/openecomp_rackspace.env b/heat/OpenECOMP/openecomp_rackspace.env
deleted file mode 100644
index 1d9ee021..00000000
--- a/heat/OpenECOMP/openecomp_rackspace.env
+++ /dev/null
@@ -1,48 +0,0 @@
-parameters:
-
-  # Generic parameters used across all ONAP components
-
-  public_net_id: 00000000-0000-0000-0000-000000000000
-
-  key_name: ecomp_key
-
-  pub_key: INSERT YOUR PUBLIC KEY HERE
-
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: INSERT YOUR USERNAME HERE
-
-  nexus_password: INSERT YOUR PASSWORD HERE
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.0.0
-
-  docker_version: 1.0-STAGING-latest
-
-  gerrit_branch: release-1.0.0
-
-
-  # Parameters for DCAE instantiation
-
-  dcae_zone: iad4
-
-  dcae_state: vi
-
-  openstack_tenant_id: INSERT YOUR TENANT ID HERE
-
-  openstack_username: INSERT YOUR USERNAME HERE
-
-  openstack_api_key: INSERT YOUR API KEY HERE
-
-  openstack_password: INSERT YOUR PASSWORD HERE
-
-  nexus_repo_root: https://nexus.onap.org
-
-  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
-  openstack_region: IAD
-
-  gitlab_branch: master
diff --git a/heat/OpenECOMP/openecomp_rackspace.yaml b/heat/OpenECOMP/openecomp_rackspace.yaml
deleted file mode 100644
index 489422e0..00000000
--- a/heat/OpenECOMP/openecomp_rackspace.yaml
+++ /dev/null
@@ -1,1166 +0,0 @@
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy ONAP components
-
-parameters:
-
-  # Generic parameters used across all ONAP components
-  public_net_id:
-    type: string
-    label: Public network name or ID
-    description: Public network that enables remote connection to the compute instance
-
-  key_name:
-    type: string
-    label: Key pair name
-    description: Public/Private key pair name
-
-  pub_key:
-    type: string
-    label: Public key
-    description: Public key or SSL certificate to be installed on the compute instance
-
-  nexus_repo:
-    type: string
-    label: Nexus Repository
-    description: Complete URL for the Nexus repository.
-
-  nexus_docker_repo:
-    type: string
-    label: Nexus Docker Images Repository
-    description: Complete URL for the Nexus repository for docker images.
-
-  nexus_username:
-    type: string
-    label: Nexus Repository Username
-    description: Nexus Repository username
-
-  nexus_password:
-    type: string
-    label: Nexus Repository Password
-    description: Nexus Repository Password
-
-  dmaap_topic:
-    type: string
-    label: DmaaP Topic
-    description: DmaaP Topic that MSO and A&AI listen to
-
-  artifacts_version:
-    type: string
-    label: Artifacts Version
-    description: Artifacts version of ONAP components
-    
-  docker_version:
-    type: string
-    label: Docker Version
-    description: Docker version of ONAP docker images
-
-  gerrit_branch:
-    type: string
-    label: Gerrit code branch
-    description: Gerrit branch where to download the code from
-
-  # Parameters for DCAE instantiation
-  dcae_zone:
-    type: string
-    label: DCAE Zone
-    description: DCAE Zone to use in VM names created by DCAE controller
-
-  dcae_state:
-    type: string
-    label: DCAE State
-    description: DCAE State to use in VM names created by DCAE controller
-
-  openstack_tenant_id:
-    type: string
-    label: Rackspace tenant ID
-    description: Rackspace tenant ID
-
-  openstack_username:
-    type: string
-    label: Rackspace username
-    description: Rackspace username
-
-  openstack_api_key:
-    type: string
-    label: Rackspace API Key
-    description: Rackspace API Key
-
-  openstack_password:
-    type: string
-    label: Rackspace Password
-    description: Rackspace Password
-
-  nexus_repo_root:
-    type: string
-    label: Root URL of nexus repository
-    description: Root URL of nexus repository
-    
-  nexus_url_snapshot:
-    type: string
-    label: Snapshot of Maven repository for DCAE deployment
-    description: Snapshot of Maven repository
-
-  openstack_region:
-    type: string
-    label: Rackspace Region
-    description: Rackspace region where the DCAE controller will spin the VMs
-
-  gitlab_branch:
-    type: string
-    label: Branch of the Gitlab repository
-    description: Branch of the Gitlab repository
-    
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-  # Public key used to access ONAP components
-  vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name: 
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }         
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-
-  # ONAP management private network
-  oam_ecomp:
-    type: OS::Neutron::Net
-    properties:
-      name: 
-        str_replace:
-          template: oam_ecomp_rand
-          params:
-            rand: { get_resource: random-str }
-
-  oam_ecomp_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name: 
-        str_replace:
-          template: oam_ecomp_rand
-          params:
-            rand: { get_resource: random-str }
-      network_id: { get_resource: oam_ecomp }
-      cidr: 10.0.0.0/8
-
-
-  # DNS Server instantiation
-  dns_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.0.1}]
-
-  dns_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name: vm1-dns-server
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dns_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __artifacts_version__: { get_param: artifacts_version }
-          template: |
-            #!/bin/bash
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk bind9 bind9utils bind9-doc ntp ntpdate
-
-            # Download script
-            mkdir /etc/bind/zones
-
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/db_simpledemo_openecomp_org -o /etc/bind/zones/db.simpledemo.openecomp.org
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/named.conf.options -o /etc/bind/named.conf.options
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/named.conf.local -o /etc/bind/named.conf.local
-
-            # Configure Bind
-            modprobe ip_gre
-            sed -i "s/OPTIONS=.*/OPTIONS=\"-4 -u bind\"/g" /etc/default/bind9
-            service bind9 restart
-
-
-  # A&AI instantiation
-  aai_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.1.1}]
-
-  aai_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-aai
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  aai_vm:
-    type: OS::Nova::Server
-    depends_on: sdc_vm
-    properties:
-      flavor: 15 GB Compute v1
-      name: vm1-aai
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: aai_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: aai_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-            
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_vm_init.sh -o /opt/aai_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_serv.sh -o /opt/aai_serv.sh
-            chmod +x /opt/aai_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-
-            mkdir -p /opt/openecomp/aai/logs
-            mkdir -p /opt/openecomp/aai/data
-            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
-            
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            
-            # Execute docker instructions
-            cd /opt
-            ./aai_vm_init.sh
-
-
-  # MSO instantiation
-  mso_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.5.1}]
-
-  mso_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name: vm1-mso
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: mso_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_vm_init.sh -o /opt/mso_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_serv.sh -o /opt/mso_serv.sh
-            chmod +x /opt/mso_vm_init.sh
-            chmod +x /opt/mso_serv.sh
-            mv /opt/mso_serv.sh /etc/init.d
-            update-rc.d mso_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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 docker-engine
-            service docker start
-
-            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
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/mso/docker-config.git test_lab
-            MSO_ENCRYPTION_KEY=$(cat /opt/test_lab/encryption.key)
-            echo -n "__openstack_api_key__" | openssl aes-128-ecb -e -K $MSO_ENCRYPTION_KEY -nosalt | xxd -c 256 -p > /opt/config/api_key.txt
-            ./mso_vm_init.sh
-
-
-  # Message Router instantiation
-  mrouter_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.11.1}]
-
-  mrouter_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 15 GB I/O v1
-      name: vm1-message-router
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: mrouter_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-            
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_vm_init.sh -o /opt/mr_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_serv.sh -o /opt/mr_serv.sh
-            chmod +x /opt/mr_vm_init.sh
-            chmod +x /opt/mr_serv.sh
-            mv /opt/mr_serv.sh /etc/init.d
-            update-rc.d mr_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-
-            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
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/message-router.git dcae-startup-vm-message-router
-            ./mr_vm_init.sh
-
-
-  # RobotE2E instantiation
-  robot_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.10.1}]
- 
-  robot_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-      flavor: 2 GB General Purpose v1
-      name: vm1-robot
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: robot_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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_ecomp, name] }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __openstack_password__: { get_param: openstack_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __openstack_region__: { get_param: openstack_region }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
- 
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-            echo "APT::Periodic::Unattended-Upgrade \"0\";" >> /etc/apt/apt.conf.d/10periodic
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_vm_init.sh -o /opt/robot_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_serv.sh -o /opt/robot_serv.sh
-            chmod +x /opt/robot_vm_init.sh
-            chmod +x /opt/robot_serv.sh
-            mv /opt/robot_serv.sh /etc/init.d
-            update-rc.d robot_serv.sh defaults
- 
-            # Download and install docker-engine and docker-compose
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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 docker-engine
-            service docker start
- 
-            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
- 
-            # Store credentials in files
-            mkdir -p /opt/config
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_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_password__" > /opt/config/openstack_password.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/region.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-
-            # Execute RobotETE-specific instructions: create share folder to run as a docker volume
-            mkdir -p /opt/eteshare/logs
-            mkdir -p /opt/eteshare/config
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/testsuite/properties.git testsuite/properties
-            ./robot_vm_init.sh
-
-
-  # VID instantiation
-  vid_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.8.1}]
-
-  vid_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 2 GB General Purpose v1
-      name: vm1-vid
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vid_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk make git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_vm_init.sh -o /opt/vid_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_serv.sh -o /opt/vid_serv.sh
-            chmod +x /opt/vid_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-
-            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
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run script to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/vid.git
-            ./vid_vm_init.sh
-
-
-  # SDN-C instantiation
-  sdnc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.7.1}]
-
-  sdnc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name: vm1-sdnc
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdnc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            mkdir /opt/config
-            echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_vm_init.sh -o /opt/sdnc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_serv.sh -o /opt/sdnc_serv.sh
-            chmod +x /opt/sdnc_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-
-            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
-            
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/sdnc/oam.git sdnc
-            ./sdnc_vm_init.sh
-
-
-  # SDC instantiation
-  sdc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.3.1}]
-
-  sdc_volume_local:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-local
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-
-  sdc_volume_data:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-data
-      size: 100
-      volume_type: SSD
-
-  sdc_volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: sdc_volume_data }
-      instance_uuid: { get_resource: sdc_vm }
-      mountpoint: /dev/xvdb
-
-  sdc_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Compute v1
-      name: vm1-sdc
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: sdc_volume_local }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-            
-            # DNS/GW IP address configuration
-            mkdir /opt/config
-            echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-          
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-            
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_vm_init.sh -o /opt/asdc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_serv.sh -o /opt/asdc_serv.sh
-            chmod +x /opt/asdc_vm_init.sh
-            chmod +x /opt/asdc_serv.sh
-            mv /opt/asdc_serv.sh /etc/init.d
-            update-rc.d asdc_serv.sh defaults
-            
-            # Download and install docker-engine and docker-compose
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-xenial 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 docker-engine
-            service docker start
-            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
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_ext_volume_partitions.txt -o /opt/asdc_ext_volume_partitions.txt
-            sfdisk /dev/xvdb < /opt/asdc_ext_volume_partitions.txt
-            mkfs -t ext4 /dev/xvdb1
-            mkdir -p /data
-            mount /dev/xvdb1 /data
-            echo "/dev/xvdb1  /data           ext4    errors=remount-ro,noatime,barrier=0 0       1" >> /etc/fstab
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "10.0.11.1" > /opt/config/mr_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run SDC-specific instructions
-            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 http://gerrit.onap.org/r/sdc.git
-
-            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-compose to spin up containers
-            ./asdc_vm_init.sh
-            
-
-  # PORTAL instantiation
-  portal_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.9.1}]
-
-  portal_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-portal
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  portal_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Memory v1
-      name: vm1-portal
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: portal_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: portal_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-            
-            # DNS/GW IP address configuration
-            mkdir /opt/config
-            echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-            
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate
-            
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_vm_init.sh -o /opt/portal_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_serv.sh -o /opt/portal_serv.sh
-            chmod +x /opt/portal_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-            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
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run Portal-specific instructions
-            mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/portal.git
-
-            # Run docker-compose to spin up containers
-            ./portal_vm_init.sh
-
-
-  # DCAE Controller instantiation
-  dcae_c_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.4.1}]
-  dcae_c_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 8 GB General Purpose v1
-      name: vm1-dcae-controller
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dcae_c_private_port }
-      user_data_format: RAW
-      user_data: 
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
-            __gitlab_branch__: { get_param: gitlab_branch }
-            __dcae_zone__: { get_param: dcae_zone }
-            __dcae_state__: { get_param: dcae_state }
-            __artifacts_version__: { get_param: artifacts_version }
-            __tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_private_network_name__: { get_attr: [oam_ecomp, name] }
-            __openstack_user__: { get_param: openstack_username }
-            __openstack_password__: { get_param: openstack_api_key }
-            __key_name__: { get_param: key_name }
-            __rand_str__: { get_resource: random-str }
-            __pub_key__: { get_param: pub_key }
-            __nexus_repo_root__: { get_param: nexus_repo_root }
-            __openstack_region__: { get_param: openstack_region }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-            
-            # DNS/GW IP address configuration
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk make git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_vm_init.sh -o /opt/dcae_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_serv.sh -o /opt/dcae_serv.sh
-            chmod +x /opt/dcae_vm_init.sh
-            chmod +x /opt/dcae_serv.sh
-            mv /opt/dcae_serv.sh /etc/init.d
-            update-rc.d dcae_serv.sh defaults
-
-            # Download and install docker-engine and docker-compose
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-            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
-            
-            # DCAE Controller specific deployment
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/dcae/demo/startup/controller.git dcae-startup-vm-controller
-
-            cd dcae-startup-vm-controller
-            mkdir -p /opt/app/dcae-controller
-            cat > /opt/app/dcae-controller/config.yaml << EOF_CONFIG
-            ZONE: __dcae_zone__
-            STATE: __dcae_state__
-            DCAE-VERSION: __artifacts_version__
-            HORIZON-URL: https://mycloud.rackspace.com/cloud/__tenant_id__
-            KEYSTONE-URL: https://identity.api.rackspacecloud.com/v2.0
-            OPENSTACK-TENANT-ID: __tenant_id__
-            OPENSTACK-TENANT-NAME: OPEN-ECOMP
-            OPENSTACK-REGION: __openstack_region__
-            OPENSTACK-PRIVATE-NETWORK: __openstack_private_network_name__
-            OPENSTACK-USER: __openstack_user__
-            OPENSTACK-PASSWORD: __openstack_password__
-            OPENSTACK-KEYNAME: __key_name_____rand_str___dcae
-            OPENSTACK-PUBKEY: __pub_key__
-            
-            NEXUS-URL-ROOT: __nexus_repo_root__
-            NEXUS-USER: __nexus_username__
-            NEXUS-PASSWORD: __nexus_password__
-            NEXUS-URL-SNAPSHOTS: __nexus_url_snapshots__
-            NEXUS-RAWURL: __nexus_repo__
-            
-            DOCKER-REGISTRY: __nexus_docker_repo__
-
-            GIT-MR-REPO: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
-            EOF_CONFIG
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__gitlab_branch__" > /opt/config/gitlab_branch.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-
-            cd /opt
-            ./dcae_vm_init.sh
-
-
-  # Policy engine instantiation
-  policy_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.6.1}]
-
-  policy_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-policy
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  policy_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Compute v1
-      name: vm1-policy
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: policy_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: policy_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-            
-            # DNS/GW IP address configuration
-            mkdir /opt/config
-            echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_vm_init.sh -o /opt/policy_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_serv.sh -o /opt/policy_serv.sh
-            chmod +x /opt/policy_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-            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
-
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/policy/docker.git policy
-
-            ./policy_vm_init.sh
-
-
-  # APP-C instantiation
-  appc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.2.1}]
-
-  appc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name: vm1-appc
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: appc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_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 }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
-          template: |
-            #!/bin/bash
-
-            # DNS/GW IP address configuration
-            mkdir /opt/config
-            echo "10.0.0.1" > /opt/config/dns_gw_ip.txt
-            echo "nameserver 10.0.0.1" >> /etc/resolvconf/resolv.conf.d/head
-            resolvconf -u
-
-            # Download dependencies
-            add-apt-repository -y ppa:openjdk-r/ppa
-            apt-get update
-            apt-get install -y apt-transport-https ca-certificates wget openjdk-7-jdk git ntp ntpdate
-
-            # Download scripts from Nexus
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_vm_init.sh -o /opt/appc_vm_init.sh
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_serv.sh -o /opt/appc_serv.sh
-            chmod +x /opt/appc_vm_init.sh
-            chmod +x /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
-            apt-key adv --keyserver hkp://ha.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-            echo "deb https://apt.dockerproject.org/repo ubuntu-trusty 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 docker-engine
-            service docker start
-
-            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
-            
-            # Store credentials in files
-            mkdir -p /opt/config
-            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 "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-
-            # Run docker-compose to spin up containers
-            cd /opt
-            git clone -b __gerrit_branch__ --single-branch http://gerrit.onap.org/r/appc/deployment.git appc
-            ./appc_vm_init.sh
-