Send both ubuntu versions to Robot VM
[demo.git] / heat / ONAP / onap_openstack.yaml
index 44737be..2db9f8b 100644 (file)
@@ -1,9 +1,9 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
 #
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+#
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -39,10 +39,14 @@ parameters:
   # Parameters used across all ONAP components #
   #                                            #
   ##############################################
-  
+
   public_net_id:
     type: string
-    description: Public network for floating IP address allocation
+    description: The ID of the Public network for floating IP address allocation
+
+  public_net_name:
+    type: string
+    description: The name of the Public network referred by public_net_id
 
   ubuntu_1404_image:
     type: string
@@ -68,6 +72,10 @@ parameters:
     type: string
     description: Name of the Extra Large Flavor supported by the cloud provider
 
+  flavor_xxlarge:
+    type: string
+    description: Name of the Extra Extra Large Flavor supported by the cloud provider
+
   vm_base_name:
     type: string
     description: Base name of ONAP VMs
@@ -100,46 +108,45 @@ parameters:
     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
+    description: OpenStack tenant ID
+
+  openstack_tenant_name:
+    type: string
+    description: OpenStack tenant name (matching with the openstack_tenant_id)
 
   openstack_username:
     type: string
-    description: Openstack username
+    description: OpenStack username
 
   openstack_auth_method:
     type: string
-    description: Openstack authentication method (password VS. api-key)
+    description: OpenStack authentication method (password VS. api-key)
 
   openstack_api_key:
     type: string
-    description: Openstack API Key
+    description: OpenStack password or API Key
 
   horizon_url:
     type: string
-    description: URL of Openstack Horizon
+    description: URL of OpenStack Horizon
 
   keystone_url:
     type: string
-    description: URL of Openstack Keystone
+    description: URL of OpenStack Keystone
 
   cloud_env:
     type: string
-    description: Cloud Provider Name
+    description: Cloud Provider Name in lower case
+
+  openstack_region:
+    type: string
+    description: Region where the DCAE controller will spin the VMs
 
   ######################
   #                    #
@@ -153,146 +160,97 @@ parameters:
 
   external_dns:
     type: string
-    description: First element of the dns_list for ONAP network
+    description: Public IP of the external DNS for ONAP network
+
+  dns_forwarder:
+    type: string
+    description: the forwarder address for setting up ONAP's private DNS server
 
-  ### Private IP addresses ###
   oam_network_cidr:
     type: string
     description: CIDR of the OAM ONAP network
 
+  ### Private IP addresses ###
   aai1_ip_addr:
     type: string
-    description: AAI Instance 1 IP Address
-
   aai2_ip_addr:
     type: string
-    description: AAI Instance 2 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:
+  so_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
-
   clamp_ip_addr:
     type: string
-    description: CLAMP IP Address
-
-  dcae_coll_float_ip:
+  openo_ip_addr:
     type: string
-    description: DCAE Collector Floating IP Address
 
-  dcae_db_float_ip:
-    type: string
-    description: DCAE Collector Database Floating IP Address
+  ###########################
+  #                         #
+  # Parameters used by DCAE #
+  #                         #
+  ###########################
 
-  dcae_hdp1_float_ip:
+  dnsaas_config_enabled:
     type: string
-    description: Hadoop VM1 Floating IP Address
+    description: whether the DNSaaS configuration section is enabled
 
-  dcae_hdp2_float_ip:
+  dnsaas_region:
     type: string
-    description: Hadoop VM2 Floating IP Address
+    description: the region of the cloud instance providing the Designate DNS as a Service
 
-  dcae_hdp3_float_ip:
+  dnsaas_keystone_url:
     type: string
-    description: Hadoop VM3 Floating IP Address
+    description: the keystone URL of the cloud instance providing the Designate DNS as a Service
 
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_base_environment:
+  dnsaas_username:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
+    description: the username of the cloud instance providing the Designate DNS as a Service
 
-  dcae_zone:
+  dnsaas_password:
     type: string
-    description: DCAE Zone to use in VM names created by DCAE controller
+    description: the password of the cloud instance providing the Designate DNS as a Service
 
-  dcae_state:
+  dnsaas_tenant_name:
     type: string
-    description: DCAE State to use in VM names created by DCAE controller
+    description: the name of the tenant in the cloud instance providing the Designate DNS as a Service
 
-  nexus_repo_root:
+  dcae_keystone_url:
     type: string
-    description: Root URL of Nexus repository
+    description: the keystone URL for DCAE to use (via MultiCloud)
 
-  nexus_url_snapshot:
+  dcae_private_key:
     type: string
-    description: Snapshot of Maven repository for DCAE deployment
+    description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
 
-  openstack_region:
+  dcae_public_key:
     type: string
-    description: Region where the DCAE controller will spin the VMs
+    description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
 
-  gitlab_branch:
+  dcae_centos_7_image:
     type: string
-    description: Branch of the Gitlab repository
-    
-  dcae_code_version:
+    description: the id/name of the CentOS 7 VM imange
+
+  dcae_domain:
     type: string
-    description: DCAE Code Version Number
+    description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
 
   #####################
   #                   #
@@ -302,51 +260,126 @@ parameters:
 
   aai_repo:
     type: string
-    description: AAI repository
-
   appc_repo:
     type: string
-    description: APPC repository
-
-  dcae_repo:
-    type: string
-    description: DCAE repository
-
   mr_repo:
     type: string
-    description: Message Router repository
-
-  mso_repo:
+  so_repo:
     type: string
-    description: MSO repository
-
   policy_repo:
     type: string
-    description: Policy repository
-
   portal_repo:
     type: string
-    description: Portal repository
-
   robot_repo:
     type: string
-    description: Robot repository
-
   sdc_repo:
     type: string
-    description: SDC repository
-
   sdnc_repo:
     type: string
-    description: SDNC repository
-
   vid_repo:
     type: string
-    description: VID repository
-
   clamp_repo:
     type: string
-    description: CLAMP repository
+  vnfsdk_repo:
+    type: string
+
+  ################################
+  #                              #
+  # Docker versions and branches #
+  #                              #
+  ################################
+
+  aai_docker:
+    type: string
+  aai_sparky_docker:
+    type: string
+  appc_docker:
+    type: string
+  so_docker:
+    type: string
+  dcae_docker:
+    type: string
+  policy_docker:
+    type: string
+  portal_docker:
+    type: string
+  robot_docker:
+    type: string
+  sdc_docker:
+    type: string
+  sdnc_docker:
+    type: string
+  vid_docker:
+    type: string
+  clamp_docker:
+    type: string
+  msb_docker:
+    type: string
+  mvim_docker:
+    type: string
+  uui_docker:
+    type: string
+  esr_docker:
+    type: string
+  dgbuilder_docker:
+    type: string
+  cli_docker:
+    type: string
+  vfc_nokia_docker:
+    type: string
+  vfc_ztevmanagerdriver_docker:
+    type: string
+  vfc_ztesdncdriver_docker:
+    type: string
+  vfc_vnfres_docker:
+    type: string
+  vfc_vnfmgr_docker:
+    type: string
+  vfc_vnflcm_docker:
+    type: string
+  vfc_resmanagement_docker:
+    type: string
+  vfc_nslcm_docker:
+    type: string
+  vfc_huawei_docker:
+    type: string
+  vfc_jujudriver_docker:
+    type: string
+  vfc_gvnfmdriver_docker:
+    type: string
+  vfc_emsdriver_docker:
+    type: string
+  vfc_catalog_docker:
+    type: string
+  vfc_wfengine_mgrservice_docker:
+    type: string
+  vfc_wfengine_activiti_docker:
+    type: string
+
+  aai_branch:
+    type: string
+  appc_branch:
+    type: string
+  so_branch:
+    type: string
+  mr_branch:
+    type: string
+  policy_branch:
+    type: string
+  portal_branch:
+    type: string
+  robot_branch:
+    type: string
+  sdc_branch:
+    type: string
+  sdnc_branch:
+    type: string
+  vid_branch:
+    type: string
+  clamp_branch:
+    type: string
+  vnfsdk_branch:
+    type: string
 
 
 #############
@@ -361,7 +394,6 @@ resources:
     properties:
       length: 4
 
-
   # Public key used to access ONAP components
   vm_key:
     type: OS::Nova::KeyPair
@@ -376,6 +408,35 @@ resources:
       save_private_key: false
 
 
+  # ONAP security group
+  onap_sg:
+    type: OS::Neutron::SecurityGroup
+    properties:
+      name:
+        str_replace:
+          template: base_rand
+          params:
+            base: onap_sg
+            rand: { get_resource: random-str }
+      description: security group used by ONAP
+      rules:
+        # All egress traffic
+        - direction: egress
+          ethertype: IPv4
+        - direction: egress
+          ethertype: IPv6
+        # ingress traffic
+        # ICMP
+        - protocol: icmp
+        - protocol: udp
+          port_range_min: 1
+          port_range_max: 65535
+        - protocol: tcp
+          port_range_min: 1
+          port_range_max: 65535
+
+
+
   # ONAP management private network
   oam_onap:
     type: OS::Neutron::Net
@@ -417,6 +478,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dns_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   dns_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -449,8 +512,7 @@ resources:
             __aai2_ip_addr__: { get_param: aai2_ip_addr }
             __appc_ip_addr__: { get_param: appc_ip_addr }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr }
-            __mso_ip_addr__: { get_param: mso_ip_addr }
+            __so_ip_addr__: { get_param: so_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
             __portal_ip_addr__: { get_param: portal_ip_addr }
@@ -459,8 +521,10 @@ resources:
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __clamp_ip_addr__: { get_param: clamp_ip_addr }
+            __openo_ip_addr__: { get_param: openo_ip_addr }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __dns_forwarder__: { get_param: dns_forwarder }
           template: |
             #!/bin/bash
 
@@ -475,8 +539,7 @@ resources:
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
             echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
             echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
-            echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
+            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
@@ -485,7 +548,9 @@ resources:
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
+            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
@@ -500,6 +565,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai1_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   aai1_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -517,7 +584,7 @@ resources:
         str_replace:
           template: base-aai-inst1
           params:
-            base: { get_param: vm_base_name }      
+            base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: aai1_private_port }
@@ -532,8 +599,9 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: aai_docker }
+            __aai_sparky_docker__ : { get_param: aai_sparky_docker }
+            __gerrit_branch__: { get_param: aai_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __aai_repo__: { get_param: aai_repo }
@@ -550,6 +618,7 @@ resources:
             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 "__aai_sparky_docker__" > /opt/config/sparky_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "aai_instance_1" > /opt/config/aai_instance.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
@@ -568,6 +637,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai2_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   aai2_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -584,7 +655,7 @@ resources:
         str_replace:
           template: base-aai-inst2
           params:
-            base: { get_param: vm_base_name }      
+            base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: aai2_private_port }
@@ -599,8 +670,8 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: aai_docker }
+            __gerrit_branch__: { get_param: aai_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __aai_repo__: { get_param: aai_repo }
@@ -630,32 +701,34 @@ resources:
             ./aai_install.sh
 
 
-  # MSO instantiation
-  mso_private_port:
+  # SO instantiation
+  so_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mso_ip_addr }}]
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
-  mso_floating_ip:
+  so_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: mso_private_port }
+      port_id: { get_resource: so_private_port }
 
-  mso_vm:
+  so_vm:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
       name:
         str_replace:
-          template: base-mso
+          template: base-so
           params:
-            base: { get_param: vm_base_name }      
+            base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
-        - port: { get_resource: mso_private_port }
+        - port: { get_resource: so_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -672,11 +745,12 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __openo_ip__: { get_param: openo_ip_addr }
+            __docker_version__: { get_param: so_docker }
+            __gerrit_branch__: { get_param: so_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
-            __mso_repo__: { get_param: mso_repo }
+            __so_repo__: { get_param: so_repo }
           template: |
             #!/bin/bash
 
@@ -688,6 +762,7 @@ resources:
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__openo_ip__" > /opt/config/openo_ip.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__openstack_username__" > /opt/config/openstack_username.txt
             echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
@@ -698,13 +773,13 @@ resources:
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__mso_repo__" > /opt/config/remote_repo.txt
+            echo "__so_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh
+            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
             cd /opt
-            chmod +x mso_install.sh
-            ./mso_install.sh
+            chmod +x so_install.sh
+            ./so_install.sh
 
 
   # Message Router instantiation
@@ -713,6 +788,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mr_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   mrouter_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -726,7 +803,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
       name:
-        str_replace: 
+        str_replace:
           template: base-message-router
           params:
             base: { get_param: vm_base_name }
@@ -743,7 +820,7 @@ resources:
             __nexus_password__: { get_param: nexus_password }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __gerrit_branch__: { get_param: mr_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __mr_repo__: { get_param: mr_repo }
@@ -776,20 +853,22 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: robot_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   robot_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
       port_id: { get_resource: robot_private_port }
+
   robot_vm:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_small }
+      flavor: { get_param: flavor_medium }
       name:
-        str_replace: 
+        str_replace:
           template: base-robot
           params:
             base: { get_param: vm_base_name }
@@ -811,25 +890,30 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __openstack_region__: { get_param: openstack_region }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __gerrit_branch__: { get_param: robot_branch }
             __cloud_env__: { get_param: cloud_env }
             __keystone_url__: { get_param: keystone_url }
             __aai1_ip_addr__: { get_param: aai1_ip_addr }
             __aai2_ip_addr__: { get_param: aai2_ip_addr }
             __appc_ip_addr__: { get_param: appc_ip_addr }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __mso_ip_addr__: { get_param: mso_ip_addr }
+            __so_ip_addr__: { get_param: so_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
             __portal_ip_addr__: { get_param: portal_ip_addr }
             __sdc_ip_addr__: { get_param: sdc_ip_addr }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
+            __clamp_ip_addr__: { get_param: clamp_ip_addr }
+            __openo_ip_addr__: { get_param: openo_ip_addr }
             __external_dns__: { get_param: external_dns }
-            __vm_image_name__: { get_param: ubuntu_1404_image }
+            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
+            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
             __vm_flavor__: { get_param: flavor_medium }
+            __public_net_id__: { get_param: public_net_id }
+            __script_version__: { get_param: artifacts_version }
             __robot_repo__: { get_param: robot_repo }
+            __docker_version__: { get_param: robot_docker }
           template: |
             #!/bin/bash
 
@@ -853,17 +937,22 @@ resources:
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
             echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
             echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt
+            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
+            echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
+            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
+            echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
+            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
             echo "__vm_flavor__" > /opt/config/vm_flavor.txt
+            echo "__script_version__" > /opt/config/script_version.txt
+            echo "__public_net_id__" > /opt/config/public_net_id.txt
             echo "__robot_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
@@ -879,6 +968,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: vid_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   vid_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -892,7 +983,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
       name:
-        str_replace: 
+        str_replace:
           template: base-vid
           params:
             base: { get_param: vm_base_name }
@@ -909,8 +1000,8 @@ resources:
             __nexus_password__: { get_param: nexus_password }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: vid_docker }
+            __gerrit_branch__: { get_param: vid_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __vid_repo__: { get_param: vid_repo }
@@ -937,13 +1028,15 @@ resources:
             chmod +x vid_install.sh
             ./vid_install.sh
 
+
   # SDN-C instantiation
   sdnc_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdnc_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   sdnc_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -957,7 +1050,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
       name:
-        str_replace: 
+        str_replace:
           template: base-sdnc
           params:
             base: { get_param: vm_base_name }
@@ -974,8 +1067,9 @@ resources:
             __nexus_password__: { get_param: nexus_password }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: sdnc_docker }
+            __gerrit_branch__: { get_param: sdnc_branch }
+            __dgbuilder_docker__: { get_param: dgbuilder_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __sdnc_repo__: { get_param: sdnc_repo }
@@ -992,6 +1086,7 @@ resources:
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__sdnc_repo__" > /opt/config/remote_repo.txt
@@ -1009,6 +1104,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   sdc_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -1028,7 +1125,7 @@ resources:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
       name:
-        str_replace: 
+        str_replace:
           template: base-sdc
           params:
             base: { get_param: vm_base_name }
@@ -1050,9 +1147,9 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
-            __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __private_ip__: { get_param: sdc_ip_addr }
+            __docker_version__: { get_param: sdc_docker }
+            __gerrit_branch__: { get_param: sdc_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __sdc_repo__: { get_param: sdc_repo }
@@ -1067,7 +1164,7 @@ resources:
             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 "__private_ip__" > /opt/config/private_ip.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
@@ -1089,6 +1186,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: portal_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   portal_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -1102,7 +1201,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
       name:
-        str_replace: 
+        str_replace:
           template: base-portal
           params:
             base: { get_param: vm_base_name }
@@ -1120,8 +1219,9 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: portal_docker }
+            __gerrit_branch__: { get_param: portal_branch }
+            __cli_docker__: { get_param: cli_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __portal_repo__: { get_param: portal_repo }
@@ -1139,6 +1239,7 @@ resources:
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cli_docker__" > /opt/config/cli_docker_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__portal_repo__" > /opt/config/remote_repo.txt
@@ -1150,153 +1251,14 @@ resources:
             ./portal_install.sh
 
 
-  # DCAE Controller instantiation
-  dcae_c_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
-
-  dcae_c_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dcae_c_private_port }
-
-  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:
-        - 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 }
-            __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_onap, 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 }
-            __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
-            __dcae_coll_float_ip__: { get_param: dcae_coll_float_ip }
-            __dcae_db_float_ip__: { get_param: dcae_db_float_ip }
-            __dcae_hdp1_float_ip__: { get_param: dcae_hdp1_float_ip }
-            __dcae_hdp2_float_ip__: { get_param: dcae_hdp2_float_ip }
-            __dcae_hdp3_float_ip__: { get_param: dcae_hdp3_float_ip }
-            __external_dns__: { get_param: external_dns }
-            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __flavor_small__: { get_param: flavor_small }
-            __flavor_medium__: { get_param: flavor_medium }
-            __flavor_large__: { get_param: flavor_large }
-            __flavor_xlarge__: { get_param: flavor_xlarge }
-            __dcae_repo__: { get_param: dcae_repo }
-            __mr_repo__: { get_param: mr_repo }
-          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 "__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
-            echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
-            echo "__dcae_coll_float_ip__" > /opt/config/dcae_coll_float_ip.txt
-            echo "__dcae_db_float_ip__" > /opt/config/dcae_db_float_ip.txt
-            echo "__dcae_hdp1_float_ip__" > /opt/config/dcae_hdp1_float_ip.txt
-            echo "__dcae_hdp2_float_ip__" > /opt/config/dcae_hdp2_float_ip.txt
-            echo "__dcae_hdp3_float_ip__" > /opt/config/dcae_hdp3_float_ip.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
-            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-            echo "__flavor_small__" > /opt/config/flavor_small.txt
-            echo "__flavor_medium__" > /opt/config/flavor_medium.txt
-            echo "__flavor_large__" > /opt/config/flavor_large.txt
-            echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt
-            echo "__dcae_repo__" > /opt/config/remote_repo.txt
-            echo "__mr_repo__" > /opt/config/mr_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.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_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: policy_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   policy_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -1310,7 +1272,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
       name:
-        str_replace: 
+        str_replace:
           template: base-policy
           params:
             base: { get_param: vm_base_name }
@@ -1328,8 +1290,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: policy_docker }
+            __gerrit_branch__: { get_param: policy_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __policy_repo__: { get_param: policy_repo }
@@ -1364,6 +1326,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   appc_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -1377,7 +1341,7 @@ resources:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
       name:
-        str_replace: 
+        str_replace:
           template: base-appc
           params:
             base: { get_param: vm_base_name }
@@ -1395,8 +1359,9 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: appc_docker }
+            __gerrit_branch__: { get_param: appc_branch }
+            __dgbuilder_docker__: { get_param: dgbuilder_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __appc_repo__: { get_param: appc_repo }
@@ -1414,6 +1379,7 @@ resources:
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__appc_repo__" > /opt/config/remote_repo.txt
@@ -1431,6 +1397,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   clamp_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -1447,7 +1415,7 @@ resources:
         str_replace:
           template: base-clamp
           params:
-            base: { get_param: vm_base_name }      
+            base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: clamp_private_port }
@@ -1467,8 +1435,8 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: docker_version }
-            __gerrit_branch__: { get_param: gerrit_branch }
+            __docker_version__: { get_param: clamp_docker }
+            __gerrit_branch__: { get_param: clamp_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __clamp_repo__: { get_param: clamp_repo }
@@ -1500,3 +1468,310 @@ resources:
             cd /opt
             chmod +x clamp_install.sh
             ./clamp_install.sh
+
+
+  # OPEN-O VM instantiation
+  openo_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  openo_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: openo_private_port }
+
+  openo_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_xxlarge }
+      name:
+        str_replace:
+          template: base-multi-service
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: openo_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 }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __oam_network_cidr__: { get_param: oam_network_cidr }
+            __aai1_ip_addr__: { get_param: aai1_ip_addr }
+            __aai2_ip_addr__: { get_param: aai2_ip_addr }
+            __appc_ip_addr__: { get_param: appc_ip_addr }
+            __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __so_ip_addr__: { get_param: so_ip_addr }
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __policy_ip_addr__: { get_param: policy_ip_addr }
+            __portal_ip_addr__: { get_param: portal_ip_addr }
+            __robot_ip_addr__: { get_param: robot_ip_addr }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
+            __vid_ip_addr__: { get_param: vid_ip_addr }
+            __clamp_ip_addr__: { get_param: clamp_ip_addr }
+            __openo_ip_addr__: { get_param: openo_ip_addr }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+            __vnfsdk_branch__: { get_param: vnfsdk_branch }
+            __msb_docker__: { get_param: msb_docker }
+            __mvim_docker__: { get_param: mvim_docker }
+            __uui_docker__: { get_param: uui_docker }
+            __esr_docker__: { get_param: esr_docker }
+            __vnfsdk_repo__: { get_param: vnfsdk_repo }
+            __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
+            __vfc_ztevmanagerdriver_docker__: { get_param: vfc_ztevmanagerdriver_docker }
+            __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
+            __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
+            __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
+            __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker }
+            __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker }
+            __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker }
+            __vfc_huawei_docker__: { get_param: vfc_huawei_docker }
+            __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker }
+            __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker }
+            __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker }
+            __vfc_catalog_docker__: { get_param: vfc_catalog_docker }
+            __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker }
+            __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_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 "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
+            echo "__msb_docker__" > /opt/config/msb_docker.txt
+            echo "__mvim_docker__" > /opt/config/mvim_docker.txt
+            echo "__uui_docker__" > /opt/config/uui_docker.txt
+            echo "__esr_docker__" > /opt/config/esr_docker.txt
+            echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
+
+            echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ZTEVMANAGERDRIVER_DOCKER_VER=__vfc_ztevmanagerdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt
+            echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt
+            echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt
+            echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt
+            echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt
+
+            # Create env file with the IP address of all ONAP components
+            echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt
+            echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
+            cd /opt
+            chmod +x openo_install.sh
+            ./openo_install.sh
+
+
+  # DCAE GEN 2 Controller instantiation
+  dcae_c_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  dcae_c_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: dcae_c_private_port }
+
+  dcae_c_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_small }
+      name:
+        str_replace:
+          template: base-dcae-bootstrap
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: dcae_c_private_port }
+      #security_groups:
+      #  - { get_resource: onap_sg }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __rand_str__: { get_resource: random-str }
+            # repo related
+            __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: dcae_docker }
+            __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 }
+            # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
+            __dcae_ip_addr__: { get_param: dcae_ip_addr }
+            __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __external_dns__: { get_param: external_dns }
+            __dns_forwarder__: { get_param: dns_forwarder }
+            __dcae_domain__: { get_param: dcae_domain }
+            # conf for VMs DCAE is to bringup
+            __openstack_keystone_url__: { get_param: keystone_url }
+            __dcae_keystone_url__: { get_param: dcae_keystone_url }
+            __dcaeos_cloud_env__: { get_param: cloud_env }
+            __dcaeos_keystone_url__: { get_param: dcae_keystone_url }
+            __dcaeos_region__: { get_param: openstack_region }
+            __dcaeos_tenant_id__: { get_param: openstack_tenant_id }
+            __dcaeos_tenant_name__: { get_param: openstack_tenant_name }
+            __dcaeos_security_group__:
+              str_replace:
+                template: 'onap_sg_rand'
+                params:
+                  rand: { get_resource: random-str }
+            #__dcaeos_security_group__: { get_attr: [onap_sg, name] }
+            __dcaeos_username__: { get_param: openstack_username }
+            __dcaeos_password__: { get_param: openstack_api_key }
+            __dcaeos_key_name__: { get_resource: vm_key }
+            __dcaeos_public_key__: { get_param: dcae_public_key }
+            __dcaeos_private_key__: { get_param: dcae_private_key }
+            __dcaeos_private_network_name__: { get_attr: [oam_onap, name] }
+            __dcaeos_public_network_name__: { get_param: public_net_name }
+            __dcaeos_ubuntu_1604_image__: { get_param: ubuntu_1604_image }
+            __dcaeos_centos_7_image__: { get_param: dcae_centos_7_image }
+            __dcaeos_flavor_id__: { get_param: flavor_medium }
+            __dcaeos_flavor_id_cdap__: { get_param: flavor_large }
+            __dcaeos_dnsaas_config_enabled__: { get_param: dnsaas_config_enabled }
+            __dcaeos_dnsaas_region__: { get_param: dnsaas_region }
+            __dcaeos_dnsaas_keystone_url__: { get_param: dnsaas_keystone_url }
+            __dnsaas_tenant_name__: { get_param: dnsaas_tenant_name }
+            __dcaeos_dnsaas_username__: { get_param: dnsaas_username }
+            __dcaeos_dnsaas_password__: { get_param: dnsaas_password }
+            # fixed private IPs
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __policy_ip_addr__: { get_param: policy_ip_addr }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __openo_ip_addr__: { get_param: openo_ip_addr }
+            __aai1_ip_addr__: { get_param: aai1_ip_addr }
+            __aai2_ip_addr__: { get_param: aai2_ip_addr }
+            # floating IPs
+            __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
+            __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
+            __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
+            __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] }
+            __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] }
+            __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
+            __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
+            __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__rand_str__" > /opt/config/dcae_zone.txt
+            echo "__rand_str__" > /opt/config/rand_str.txt
+            # repo related
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__nexus_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 "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            echo "__mac_addr__" > /opt/config/mac_addr.txt
+            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
+            echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
+            echo "__dcae_domain__" > /opt/config/dcae_domain.txt
+            # conf for the OpenStack env where DCAE is deployed
+            echo "__openstack_keystone_url__" > /opt/config/openstack_keystone_url.txt
+            echo "__dcaeos_cloud_env__" > /opt/config/cloud_env.txt
+            echo "__dcaeos_keystone_url__" > /opt/config/keystone_url.txt
+            echo "__dcaeos_region__" > /opt/config/openstack_region.txt
+            echo "__dcaeos_tenant_id__" > /opt/config/tenant_id.txt
+            echo "__dcaeos_tenant_name__" > /opt/config/tenant_name.txt
+            echo "__dcaeos_username__" > /opt/config/openstack_user.txt
+            echo "__dcaeos_password__" > /opt/config/openstack_password.txt
+            echo "__dcaeos_key_name__" > /opt/config/key_name.txt
+            echo "__dcaeos_public_key__" > /opt/config/pub_key.txt
+            echo "__dcaeos_private_key__" > /opt/config/priv_key
+            echo "__dcaeos_private_network_name__" > /opt/config/openstack_private_network_name.txt
+            echo "__dcaeos_public_network_name__" > /opt/config/public_net_name.txt
+            echo "__dcaeos_public_network_name__" > /opt/config/public_net_id.txt
+            echo "__dcaeos_ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
+            echo "__dcaeos_centos_7_image__" > /opt/config/centos_7_image.txt
+            echo "__dcaeos_security_group__" > /opt/config/security_group.txt
+            echo "__dcaeos_flavor_id__" > /opt/config/flavor_id.txt
+            echo "__dcaeos_flavor_id_cdap__" > /opt/config/flavor_id_cdap.txt
+            echo "__dcaeos_dnsaas_config_enabled__" > /opt/config/dnsaas_config_enabled.txt
+            echo "__dcaeos_dnsaas_region__" > /opt/config/dnsaas_region.txt
+            echo "__dcaeos_dnsaas_keystone_url__" > /opt/config/dnsaas_keystone_url.txt
+            echo "__dnsaas_tenant_name__" > /opt/config/dnsaas_tenant_name.txt
+            echo "__dcaeos_dnsaas_username__" > /opt/config/dnsaas_username.txt
+            echo "__dcaeos_dnsaas_password__" > /opt/config/dnsaas_password.txt
+            # fixed private IP addresses of other ONAP components
+            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+            echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
+            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
+            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
+            # floating IPs
+            echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt
+            echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt
+            echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt
+            echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt
+            echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt
+            echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
+            echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt
+            echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
+            cd /opt
+            chmod +x dcae2_install.sh
+            ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1