X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FONAP%2Fonap_openstack.yaml;h=532f91e17f59522a34b13ae82cfdbf89422b7ad5;hb=0f671db5d7e103befe6cd4c4874ddd92a0ebebfd;hp=2c4ef7667f8a942e1bf271250c24ddac8ed5bc6c;hpb=7e310d17d51fc6a50e7a46c9a9a16f717b166616;p=demo.git

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index 2c4ef766..532f91e1 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 #==================LICENSE_START==========================================
-# 
+#
 #
 # Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
@@ -39,7 +39,7 @@ parameters:
   # Parameters used across all ONAP components #
   #                                            #
   ##############################################
-  
+
   public_net_id:
     type: string
     description: The ID of the Public network for floating IP address allocation
@@ -72,10 +72,6 @@ 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
@@ -88,9 +84,10 @@ parameters:
     type: string
     description: Public key to be installed on the compute instance
 
-  nexus_repo:
+  nexus_artifact_repo:
     type: string
-    description: Complete URL for the Nexus repository.
+    description: Complete URL for the Nexus repository for Maven artifacts.
+    default: "https://nexus.onap.org"
 
   nexus_docker_repo:
     type: string
@@ -118,7 +115,7 @@ parameters:
 
   openstack_tenant_name:
     type: string
-    description: OpenStack tenant name (matching with the openstack_tenant_id) 
+    description: OpenStack tenant name (matching with the openstack_tenant_id)
 
   openstack_username:
     type: string
@@ -132,10 +129,6 @@ parameters:
     type: string
     description: OpenStack password or API Key
 
-  horizon_url:
-    type: string
-    description: URL of OpenStack Horizon
-
   keystone_url:
     type: string
     description: URL of OpenStack Keystone
@@ -160,7 +153,7 @@ 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
@@ -170,6 +163,11 @@ parameters:
     type: string
     description: CIDR of the OAM ONAP network
 
+  use_oam_net_for_robot:
+    type: boolean
+    description: Whether to use oam_network for Robot VNFs or not.  The default is false, which uses public_net_id.  Set to true if the Robot VNFs are unable to bind to the public network (needed by TLAB).
+    default: false
+
   ### Private IP addresses ###
   aai1_ip_addr:
     type: string
@@ -179,16 +177,6 @@ parameters:
     type: string
   dcae_ip_addr:
     type: string
-  dcae_coll_ip_addr:
-    type: string
-  dcae_db_ip_addr:
-    type: string
-  dcae_hdp1_ip_addr:
-    type: string
-  dcae_hdp2_ip_addr:
-    type: string
-  dcae_hdp3_ip_addr:
-    type: string
   dns_ip_addr:
     type: string
   so_ip_addr:
@@ -211,16 +199,16 @@ parameters:
     type: string
   openo_ip_addr:
     type: string
-#  dcae_coll_float_ip:
-#    type: string
-#  dcae_db_float_ip:
-#    type: string
-#  dcae_hdp1_float_ip:
-#    type: string
-#  dcae_hdp2_float_ip:
-#    type: string
-#  dcae_hdp3_float_ip:
-#    type: string
+  music_ip_addr:
+    type: string
+  oof_ip_addr:
+    type: string
+  aaf_ip_addr:
+    type: string
+  sms_ip_addr:
+    type: string
+  nbi_ip_addr:
+    type: string
 
   ###########################
   #                         #
@@ -228,6 +216,10 @@ parameters:
   #                         #
   ###########################
 
+  dcae_deployment_profile:
+    type: string
+    description: DCAE deployment profile.  Currently supported profiles R1, R2MVP.
+
   dnsaas_config_enabled:
     type: string
     description: whether the DNSaaS configuration section is enabled
@@ -272,34 +264,6 @@ parameters:
     type: string
     description: the top level domain to register DCAE VMs (the zone will be random-str.dcae_domain)
 
-#  dcae_base_environment:
-#    type: string
-#    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
-
-#  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
-
-#  gitlab_branch:
-#    type: string
-#    description: Branch of the Gitlab repository
-
-#  dcae_code_version:
-#    type: string
-#    description: DCAE Code Version Number
-
   #####################
   #                   #
   # ONAP repositories #
@@ -310,8 +274,6 @@ parameters:
     type: string
   appc_repo:
     type: string
-  dcae_repo:
-    type: string
   mr_repo:
     type: string
   so_repo:
@@ -332,6 +294,16 @@ parameters:
     type: string
   vnfsdk_repo:
     type: string
+  music_repo:
+    type: string
+  nbi_repo:
+    type: string
+  aaf_repo:
+    type: string
+  sms_repo:
+    type: string
+  oof_repo:
+    type: string
 
   ################################
   #                              #
@@ -341,14 +313,85 @@ parameters:
 
   aai_docker:
     type: string
+  aai_sparky_docker:
+    type: string
   appc_docker:
     type: string
   so_docker:
     type: string
-  mr_docker:
-    type: string
+
   dcae_docker:
     type: string
+    default: latest
+  dcae_snmptrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.collectors.snmptrap
+  dcae_ves_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.collectors.ves.vescollector
+  dcae_bootstrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.bootstrap
+  dcae_cm_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.cm-container
+  dcae_k8sbootstrap_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.k8s-bootstrap-container
+  dcae_redisc_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.redis-cluster-container
+  dcae_tca_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.deployments.tca-cdap-container
+  dcae_cb_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.cdapbroker
+  dcae_cbs_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.configbinding
+  dcae_dh_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+  dcae_inv_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.inventory-api
+  dcae_ph_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.deployment-handler
+  dcae_sch_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.platform.servicechange-handler
+  dcae_heartbeat_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.services.heartbeat
+  dcae_prh_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/org.dcaegen2.services.prh.prh-app-server
+  holmes_em_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/holmes/engine-management
+  holmes_rm_docker:
+    type: string
+    default: latest
+    description: Docker image version for onap/holmes/rule-management
+
   policy_docker:
     type: string
   portal_docker:
@@ -357,6 +400,8 @@ parameters:
     type: string
   sdc_docker:
     type: string
+  sdc_wfd_docker:
+    type: string
   sdnc_docker:
     type: string
   vid_docker:
@@ -367,7 +412,7 @@ parameters:
     type: string
   mvim_docker:
     type: string
-  vfc_docker:
+  mvim_openstack_docker:
     type: string
   uui_docker:
     type: string
@@ -377,6 +422,53 @@ parameters:
     type: string
   cli_docker:
     type: string
+  music_docker:
+    type: string
+  oof_docker:
+    type: string
+  aaf_docker:
+    type: string
+  sms_docker:
+    type: string
+  nbi_docker:
+    type: string
+  dbcl_docker:
+    type: string
+
+  vfc_nokia_docker:
+    type: string
+  vfc_nokiav2_docker:
+    type: string
+  vfc_ztevnfmdriver_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
+  vfc_multivimproxy_docker:
+    type: string
 
   aai_branch:
     type: string
@@ -386,8 +478,6 @@ parameters:
     type: string
   mr_branch:
     type: string
-  dcae_branch:
-    type: string
   policy_branch:
     type: string
   portal_branch:
@@ -404,7 +494,16 @@ parameters:
     type: string
   vnfsdk_branch:
     type: string
-
+  music_branch:
+    type: string
+  nbi_branch:
+    type: string
+  aaf_branch:
+    type: string
+  sms_branch:
+    type: string
+  oof_branch:
+    type: string
 
 #############
 #           #
@@ -459,7 +558,7 @@ resources:
           port_range_min: 1
           port_range_max: 65535
 
- 
+
 
   # ONAP management private network
   oam_onap:
@@ -502,6 +601,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
@@ -526,7 +627,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __artifacts_version__: { get_param: artifacts_version }
             __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
             __dns_ip_addr__: { get_param: dns_ip_addr }
@@ -534,7 +635,6 @@ 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 }
             __so_ip_addr__: { get_param: so_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
@@ -545,6 +645,11 @@ resources:
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __clamp_ip_addr__: { get_param: clamp_ip_addr }
             __openo_ip_addr__: { get_param: openo_ip_addr }
+            __music_ip_addr__: { get_param: music_ip_addr }
+            __oof_ip_addr__: { get_param: oof_ip_addr }
+            __aaf_ip_addr__: { get_param: aaf_ip_addr }
+            __sms_ip_addr__: { get_param: sms_ip_addr }
+            __nbi_ip_addr__: { get_param: nbi_ip_addr }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __dns_forwarder__: { get_param: dns_forwarder }
@@ -553,7 +658,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
@@ -562,7 +667,6 @@ 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 "__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
@@ -573,11 +677,19 @@ resources:
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
+            echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
+            echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+            echo "__sms_ip_addr__" > /opt/config/sms_ip_addr.txt
+            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dns_install.sh
             cd /opt
             chmod +x dns_install.sh
             ./dns_install.sh
@@ -589,6 +701,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
@@ -606,7 +720,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 }
@@ -614,7 +728,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -622,6 +736,7 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __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 }
@@ -631,7 +746,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -639,6 +754,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
@@ -646,7 +762,10 @@ resources:
             echo "__aai_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
             cd /opt
             chmod +x aai_install.sh
             ./aai_install.sh
@@ -657,6 +776,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
@@ -673,7 +794,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 }
@@ -681,7 +802,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -698,7 +819,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -713,7 +834,10 @@ resources:
             echo "__aai_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aai_install.sh
             cd /opt
             chmod +x aai_install.sh
             ./aai_install.sh
@@ -725,6 +849,8 @@ resources:
     properties:
       network: { get_resource: oam_onap }
       fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
 
   so_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -741,7 +867,7 @@ resources:
         str_replace:
           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: so_private_port }
@@ -749,7 +875,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -772,7 +898,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -792,7 +918,10 @@ resources:
             echo "__so_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt so_install.sh
             cd /opt
             chmod +x so_install.sh
             ./so_install.sh
@@ -804,6 +933,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
@@ -817,7 +948,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 }
@@ -828,7 +959,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -838,12 +969,13 @@ resources:
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __mr_repo__: { get_param: mr_repo }
+            __dbcl_docker__: { get_param: dbcl_docker }
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -853,9 +985,13 @@ resources:
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__mr_repo__" > /opt/config/remote_repo.txt
+            echo "__dbcl_docker__" > /opt/config/docker_version.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt mr_install.sh
             cd /opt
             chmod +x mr_install.sh
             ./mr_install.sh
@@ -867,20 +1003,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_medium }
       name:
-        str_replace: 
+        str_replace:
           template: base-robot
           params:
             base: { get_param: vm_base_name }
@@ -891,7 +1029,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -902,36 +1040,49 @@ 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: mr_docker }
-            __gerrit_branch__: { get_param: mr_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 }
+            __dcae_collector_ip__: { get_param: dcae_ip_addr }
             __so_ip_addr__: { get_param: so_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
             __portal_ip_addr__: { get_param: portal_ip_addr }
             __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_fe_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_ip_addr__: { get_param: sdc_ip_addr }
+            __sdc_be_onboard_ip_addr__: { get_param: sdc_ip_addr }
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __clamp_ip_addr__: { get_param: clamp_ip_addr }
             __openo_ip_addr__: { get_param: openo_ip_addr }
+            __music_ip_addr__: { get_param: music_ip_addr }
+            __oof_ip_addr__: { get_param: oof_ip_addr }
+            __aaf_ip_addr__: { get_param: aaf_ip_addr }
+            __nbi_ip_addr__: { get_param: nbi_ip_addr }
             __external_dns__: { get_param: external_dns }
+            __ubuntu_1404_image__: { get_param: ubuntu_1404_image }
+            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
             __vm_image_name__: { get_param: ubuntu_1404_image }
             __vm_flavor__: { get_param: flavor_medium }
             __public_net_id__: { get_param: public_net_id }
+            __oam_network_id__: { get_resource: oam_onap }
             __script_version__: { get_param: artifacts_version }
             __robot_repo__: { get_param: robot_repo }
+            __docker_version__: { get_param: robot_docker }
+            __vnf_pub_key__: { get_param: pub_key }
+            __use_oam_net_for_robot__: { get_param: use_oam_net_for_robot }
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir -p /opt/config
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__network_name__" > /opt/config/network.txt
@@ -948,25 +1099,50 @@ 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_collector_ip__" > /opt/config/dcae_collector_ip.txt
             echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
             echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
+            echo "__portal_ip_addr__" > /opt/config/cli_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__sdc_fe_ip_addr__" > /opt/config/sdc_fe_ip_addr.txt
+            echo "__sdc_be_ip_addr__" > /opt/config/sdc_be_ip_addr.txt
+            echo "__sdc_be_onboard_ip_addr__" > /opt/config/sdc_be_onboard_ip_addr.txt
             echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
             echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
             echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
+            echo "__openo_ip_addr__" > /opt/config/vnfsdk_ip_addr.txt
+            echo "__music_ip_addr__" > /opt/config/music_ip_addr.txt
+            echo "__oof_ip_addr__" > /opt/config/oof_ip_addr.txt
+            echo "__aaf_ip_addr__" > /opt/config/aaf_ip_addr.txt
+            echo "__nbi_ip_addr__" > /opt/config/nbi_ip_addr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
             echo "__vm_flavor__" > /opt/config/vm_flavor.txt
+            echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt
+            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
+            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
             echo "__script_version__" > /opt/config/script_version.txt
-            echo "__public_net_id__" > /opt/config/public_net_id.txt
+            if [ "__use_oam_net_for_robot__" != "False" ] && [ "__use_oam_net_for_robot__" != "false" ]; then
+              echo "__oam_network_id__" > /opt/config/public_net_id.txt
+            else
+              echo "__public_net_id__" > /opt/config/public_net_id.txt
+            fi
+            echo "__oam_network_id__" > /opt/config/oam_network_id.txt
+            echo "__use_oam_net_for_robot__" > /opt/config/use_oam_net_for_robot.txt
+            echo "__vnf_pub_key__" > /opt/config/vnf_pub_key.txt
             echo "__robot_repo__" > /opt/config/remote_repo.txt
+            echo "localhost" > /opt/config/log_elasticsearch_ip_addr.txt # these tests will be skipped by robot
+            echo "localhost" > /opt/config/log_logstash_ip_addr.txt # these tests will be skipped by robot
+            echo "localhost" > /opt/config/log_kibana_ip_addr.txt # these tests will be skipped by robot
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt robot_install.sh
             cd /opt
             chmod +x robot_install.sh
             ./robot_install.sh
@@ -978,6 +1154,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
@@ -991,7 +1169,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 }
@@ -1002,7 +1180,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1018,7 +1196,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1031,18 +1209,23 @@ resources:
             echo "__vid_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt vid_install.sh
             cd /opt
             chmod +x vid_install.sh
             ./vid_install.sh
 
- 
+
   # 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
@@ -1056,7 +1239,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 }
@@ -1067,7 +1250,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1084,7 +1267,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1098,7 +1281,10 @@ resources:
             echo "__sdnc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdnc_install.sh
             cd /opt
             chmod +x sdnc_install.sh
             ./sdnc_install.sh
@@ -1110,6 +1296,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
@@ -1129,7 +1317,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 }
@@ -1143,7 +1331,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1151,8 +1339,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] }
+            __private_ip__: { get_param: sdc_ip_addr }
             __docker_version__: { get_param: sdc_docker }
+            __sdc_wfd_docker__: { get_param: sdc_wfd_docker }
             __gerrit_branch__: { get_param: sdc_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
@@ -1162,23 +1351,27 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__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
+            echo "__sdc_wfd_docker__" > /opt/config/sdc_wfd_docker.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__sdc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sdc_install.sh
             cd /opt
             chmod +x sdc_install.sh
             ./sdc_install.sh
@@ -1190,6 +1383,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
@@ -1203,7 +1398,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 }
@@ -1214,7 +1409,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1232,7 +1427,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1247,159 +1442,23 @@ resources:
             echo "__portal_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt portal_install.sh
             cd /opt
             chmod +x portal_install.sh
             ./portal_install.sh
 
 
-  # 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: dcae_docker }
-#            __gerrit_branch__: { get_param: dcae_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
@@ -1413,7 +1472,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 }
@@ -1424,7 +1483,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1441,7 +1500,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1455,7 +1514,10 @@ resources:
             echo "__policy_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt policy_install.sh
             cd /opt
             chmod +x policy_install.sh
             ./policy_install.sh
@@ -1467,6 +1529,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
@@ -1480,7 +1544,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 }
@@ -1491,7 +1555,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1509,7 +1573,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1524,7 +1588,10 @@ resources:
             echo "__appc_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt appc_install.sh
             cd /opt
             chmod +x appc_install.sh
             ./appc_install.sh
@@ -1536,6 +1603,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
@@ -1552,7 +1621,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 }
@@ -1560,7 +1629,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1582,7 +1651,7 @@ resources:
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1601,7 +1670,10 @@ resources:
             echo "__clamp_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt clamp_install.sh
             cd /opt
             chmod +x clamp_install.sh
             ./clamp_install.sh
@@ -1613,6 +1685,8 @@ resources:
     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
@@ -1624,7 +1698,7 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xxlarge }
+      flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
           template: base-multi-service
@@ -1637,7 +1711,7 @@ resources:
       user_data:
         str_replace:
           params:
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
@@ -1648,7 +1722,6 @@ 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 }
             __so_ip_addr__: { get_param: so_ip_addr }
             __mr_ip_addr__: { get_param: mr_ip_addr }
             __policy_ip_addr__: { get_param: policy_ip_addr }
@@ -1664,16 +1737,33 @@ resources:
             __vnfsdk_branch__: { get_param: vnfsdk_branch }
             __msb_docker__: { get_param: msb_docker }
             __mvim_docker__: { get_param: mvim_docker }
-            __vfc_docker__: { get_param: vfc_docker }
+            __mvim_openstack_docker__: { get_param: mvim_openstack_docker }
             __uui_docker__: { get_param: uui_docker }
             __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
+            __vfc_nokia_docker__: { get_param: vfc_nokia_docker }
+            __vfc_nokiav2_docker__: { get_param: vfc_nokiav2_docker }
+            __vfc_ztevnfmdriver_docker__: { get_param: vfc_ztevnfmdriver_docker }
+            __vfc_multivimproxy_docker__: { get_param: vfc_multivimproxy_docker }
+            __vfc_ztesdncdriver_docker__: { get_param: vfc_ztesdncdriver_docker }
+            __vfc_vnfres_docker__: { get_param: vfc_vnfres_docker }
+            __vfc_vnfmgr_docker__: { get_param: vfc_vnfmgr_docker }
+            __vfc_vnflcm_docker__: { get_param: vfc_vnflcm_docker }
+            __vfc_resmanagement_docker__: { get_param: vfc_resmanagement_docker }
+            __vfc_nslcm_docker__: { get_param: vfc_nslcm_docker }
+            __vfc_huawei_docker__: { get_param: vfc_huawei_docker }
+            __vfc_jujudriver_docker__: { get_param: vfc_jujudriver_docker }
+            __vfc_gvnfmdriver_docker__: { get_param: vfc_gvnfmdriver_docker }
+            __vfc_emsdriver_docker__: { get_param: vfc_emsdriver_docker }
+            __vfc_catalog_docker__: { get_param: vfc_catalog_docker }
+            __vfc_wfengine_mgrservice_docker__: { get_param: vfc_wfengine_mgrservice_docker }
+            __vfc_wfengine_activiti_docker__: { get_param: vfc_wfengine_activiti_docker }
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
@@ -1685,17 +1775,34 @@ resources:
             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 "__vfc_docker__" > /opt/config/vfc_docker.txt
+            echo "__mvim_openstack_docker__" > /opt/config/mvim_openstack_docker.txt
             echo "__uui_docker__" > /opt/config/uui_docker.txt
             echo "__esr_docker__" > /opt/config/esr_docker.txt
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
+            echo "export NOKIA_DOCKER_VER=__vfc_nokia_docker__" >> /opt/config/vfc_docker.txt
+            echo "export NOKIAV2_DOCKER_VER=__vfc_nokiav2_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MULTIVIMPROXY_DOCKER_VER=__vfc_multivimproxy_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ZTEVNFMDRIVER_DOCKER_VER=__vfc_ztevnfmdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ZTESDNCDRIVER_DOCKER_VER=__vfc_ztesdncdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFRES_DOCKER_VER=__vfc_vnfres_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFMGR_DOCKER_VER=__vfc_vnfmgr_docker__" >> /opt/config/vfc_docker.txt
+            echo "export VNFLCM_DOCKER_VER=__vfc_vnflcm_docker__" >> /opt/config/vfc_docker.txt
+            echo "export RESMANAGEMENT_DOCKER_VER=__vfc_resmanagement_docker__" >> /opt/config/vfc_docker.txt
+            echo "export NSLCM_DOCKER_VER=__vfc_nslcm_docker__" >> /opt/config/vfc_docker.txt
+            echo "export HUAWEI_DOCKER_VER=__vfc_huawei_docker__" >> /opt/config/vfc_docker.txt
+            echo "export JUJUDRIVER_DOCKER_VER=__vfc_jujudriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export GVNFMDRIVER_DOCKER_VER=__vfc_gvnfmdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export EMSDRIVER_DOCKER_VER=__vfc_emsdriver_docker__" >> /opt/config/vfc_docker.txt
+            echo "export CATALOG_DOCKER_VER=__vfc_catalog_docker__" >> /opt/config/vfc_docker.txt
+            echo "export MGRSERVICE_DOCKER_VER=__vfc_wfengine_mgrservice_docker__" >> /opt/config/vfc_docker.txt
+            echo "export ACTIVITI_DOCKER_VER=__vfc_wfengine_activiti_docker__" >> /opt/config/vfc_docker.txt
+
             # Create env file with the IP address of all ONAP components
             echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt
             echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt
             echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt
             echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export DCAE_COLL_IP=__dcae_coll_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
@@ -1708,7 +1815,10 @@ resources:
             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
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt openo_install.sh
             cd /opt
             chmod +x openo_install.sh
             ./openo_install.sh
@@ -1720,6 +1830,8 @@ resources:
     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
@@ -1731,10 +1843,10 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_small }
+      flavor: { get_param: flavor_xlarge }
       name:
         str_replace:
-          template: base-dcae-bootstrap
+          template: base-dcae
           params:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
@@ -1750,13 +1862,12 @@ resources:
             # repo related
             __artifacts_version__: { get_param: artifacts_version }
             __docker_version__: { get_param: dcae_docker }
-            __nexus_repo__: { get_param: nexus_repo }
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __dcae_repo__: { get_param: dcae_repo }
-            __gerrit_branch__: { get_param: dcae_branch }
             # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            __dcae_deployment_profile__: { get_param: dcae_deployment_profile }
             __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
             __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
@@ -1772,10 +1883,10 @@ resources:
             __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: 
+            __dcaeos_security_group__:
+              str_replace:
                 template: 'onap_sg_rand'
-                params: 
+                params:
                   rand: { get_resource: random-str }
             #__dcaeos_security_group__: { get_attr: [onap_sg, name] }
             __dcaeos_username__: { get_param: openstack_username }
@@ -1788,7 +1899,7 @@ resources:
             __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_xlarge }
+            __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 }
@@ -1811,6 +1922,26 @@ resources:
             __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
             __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
             __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+            # container versions
+            __dcae_docker__:  { get_param: dcae_docker }
+            __dcae_snmptrap_docker__:  { get_param: dcae_snmptrap_docker }
+            __dcae_ves_docker__:  { get_param: dcae_ves_docker }
+            __dcae_bootstrap_docker__:  { get_param: dcae_bootstrap_docker }
+            __dcae_cm_docker__:  { get_param: dcae_cm_docker }
+            __dcae_k8sbootstrap_docker__:  { get_param: dcae_k8sbootstrap_docker }
+            __dcae_redisc_docker__:  { get_param: dcae_redisc_docker }
+            __dcae_tca_docker__:  { get_param: dcae_tca_docker }
+            __dcae_cb_docker__:  { get_param: dcae_cb_docker }
+            __dcae_cbs_docker__:  { get_param: dcae_cbs_docker }
+            __dcae_dh_docker__:  { get_param: dcae_dh_docker }
+            __dcae_inv_docker__:  { get_param: dcae_inv_docker }
+            __dcae_ph_docker__:  { get_param: dcae_ph_docker }
+            __dcae_sch_docker__:  { get_param: dcae_sch_docker }
+            __dcae_heartbeat_docker__:  { get_param: dcae_heartbeat_docker }
+            __dcae_prh_docker__:  { get_param: dcae_prh_docker }
+            __holmes_em_docker__:  { get_param: holmes_em_docker }
+            __holmes_rm_docker__:  { get_param: holmes_rm_docker }
+
 
           template: |
             #!/bin/bash
@@ -1822,19 +1953,19 @@ resources:
             # 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_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__dcae_repo__" > /opt/config/remote_repo.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
             # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            echo "__dcae_deployment_profile__" > /opt/config/dcae_deployment_profile.txt
             echo "__mac_addr__" > /opt/config/mac_addr.txt
             echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
             echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__dns_forwarder__" > /opt/config/dns_forwarder.txt  
+            echo "__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
@@ -1867,6 +1998,7 @@ resources:
             echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
             echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
             echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
+            echo "__openo_ip_addr__" > /opt/config/msb_ip_addr.txt
             echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
             echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
             # floating IPs
@@ -1878,9 +2010,389 @@ resources:
             echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
             echo "__openo_floating_ip_addr__" > /opt/config/openo_floating_ip_addr.txt
             echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt
+            # container versions
+            echo "__dcae_docker__" > /opt/config/dcae_docker.txt
+            echo "__dcae_snmptrap_docker__" > /opt/config/dcae_docker_snmptrap.txt
+            echo "__dcae_ves_docker__" > /opt/config/dcae_docker_ves.txt
+            echo "__dcae_bootstrap_docker__" > /opt/config/dcae_docker_bootstrap.txt
+            echo "__dcae_cm_docker__" > /opt/config/dcae_docker_cm.txt
+            echo "__dcae_k8sbootstrap_docker__" > /opt/config/dcae_docker_k8sbootstrap.txt
+            echo "__dcae_redisc_docker__" > /opt/config/dcae_docker_redisc.txt
+            echo "__dcae_tca_docker__" > /opt/config/dcae_docker_tca.txt
+            echo "__dcae_cb_docker__" > /opt/config/dcae_docker_cb.txt
+            echo "__dcae_cbs_docker__" > /opt/config/dcae_docker_cbs.txt
+            echo "__dcae_dh_docker__" > /opt/config/dcae_docker_dh.txt
+            echo "__dcae_inv_docker__" > /opt/config/dcae_docker_inv.txt
+            echo "__dcae_ph_docker__" > /opt/config/dcae_docker_ph.txt
+            echo "__dcae_sch_docker__" > /opt/config/dcae_docker_sch.txt
+            echo "__dcae_heartbeat_docker__" > /opt/config/dcae_docker_heartbeat.txt
+            echo "__dcae_prh_docker__" > /opt/config/dcae_docker_prh.txt
+            echo "__holmes_em_docker__" > /opt/config/holmes_docker_em.txt
+            echo "__holmes_rm_docker__" > /opt/config/holmes_docker_rm.txt
 
             # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt dcae2_install.sh
             cd /opt
             chmod +x dcae2_install.sh
             ./dcae2_install.sh > /tmp/dcae2_install.log 2>&1
+
+
+  # MUSIC instantiation
+  music_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: music_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  music_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: music_private_port }
+
+  music_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1404_image }
+      flavor: { get_param: flavor_large }
+      name:
+        str_replace:
+          template: base-music
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: music_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __artifacts_version__: { get_param: artifacts_version }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __docker_version__: { get_param: music_docker }
+            __music_repo__: { get_param: music_repo }
+            __gerrit_branch__: { get_param: music_branch }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__music_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+
+            # Download and run install script
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt music_install.sh
+            cd /opt
+            chmod +x music_install.sh
+            ./music_install.sh
+
+
+  # OOF instantiation
+  oof_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: oof_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  oof_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: oof_private_port }
+
+  oof_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_large }
+      name:
+        str_replace:
+          template: base-oof
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: oof_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __artifacts_version__: { get_param: artifacts_version }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __docker_version__: { get_param: oof_docker }
+            __oof_repo__: { get_param: oof_repo }
+            __gerrit_branch__: { get_param: oof_branch }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__oof_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+
+            # Download and run install script
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt oof_install.sh
+            cd /opt
+            chmod +x oof_install.sh
+            ./oof_install.sh
+
+
+  # AAF instantiation
+  aaf_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aaf_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  aaf_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: aaf_private_port }
+
+  aaf_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_medium }
+      name:
+        str_replace:
+          template: base-aaf
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: aaf_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __artifacts_version__: { get_param: artifacts_version }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __docker_version__: { get_param: aaf_docker }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+            __aaf_repo__: { get_param: aaf_repo }
+            __gerrit_branch__: { get_param: aaf_branch }
+            __local_ip__: { get_param: aaf_ip_addr }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__aaf_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__local_ip__" > /opt/config/local_ip.txt
+
+            # Download and run install script
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt aaf_install.sh
+            cd /opt
+            chmod +x aaf_install.sh
+            ./aaf_install.sh
+
+  # SMS instantiation
+  sms_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sms_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  sms_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: sms_private_port }
+
+  sms_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_medium }
+      name:
+        str_replace:
+          template: base-sms
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: sms_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __artifacts_version__: { get_param: artifacts_version }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __docker_version__: { get_param: sms_docker }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+            __sms_repo__: { get_param: sms_repo }
+            __gerrit_branch__: { get_param: sms_branch }
+            __local_ip__: { get_param: sms_ip_addr }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__sms_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__local_ip__" > /opt/config/local_ip.txt
+
+            # Download and run install script
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt sms_install.sh
+            cd /opt
+            chmod +x sms_install.sh
+            ./sms_install.sh
+
+  # NBI instantiation
+  nbi_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: nbi_ip_addr }}]
+      security_groups:
+      - { get_resource: onap_sg }
+
+  nbi_floating_ip:
+    type: OS::Neutron::FloatingIP
+    properties:
+      floating_network_id: { get_param: public_net_id }
+      port_id: { get_resource: nbi_private_port }
+
+  nbi_vm:
+    type: OS::Nova::Server
+    properties:
+      image: { get_param: ubuntu_1604_image }
+      flavor: { get_param: flavor_small }
+      name:
+        str_replace:
+          template: base-nbi
+          params:
+            base: { get_param: vm_base_name }
+      key_name: { get_resource: vm_key }
+      networks:
+        - port: { get_resource: nbi_private_port }
+      user_data_format: RAW
+      user_data:
+        str_replace:
+          params:
+            __nexus_artifact_repo__: { get_param: nexus_artifact_repo }
+            __nexus_docker_repo__: { get_param: nexus_docker_repo }
+            __nexus_username__: { get_param: nexus_username }
+            __nexus_password__: { get_param: nexus_password }
+            __artifacts_version__: { get_param: artifacts_version }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
+            __docker_version__: { get_param: nbi_docker }
+            __nbi_repo__: { get_param: nbi_repo }
+            __gerrit_branch__: { get_param: nbi_branch }
+            __cloud_env__: { get_param: cloud_env }
+            __external_dns__: { get_param: external_dns }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            __aai1_ip_addr__: { get_param: aai1_ip_addr }
+            __so_ip_addr__: { get_param: so_ip_addr }
+          template: |
+            #!/bin/bash
+
+            # Create configuration files
+            mkdir -p /opt/config
+            echo "__nexus_artifact_repo__" > /opt/config/nexus_artifact_repo.txt
+            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
+            echo "__nexus_username__" > /opt/config/nexus_username.txt
+            echo "__nexus_password__" > /opt/config/nexus_password.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__nbi_repo__" > /opt/config/remote_repo.txt
+            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cloud_env__" > /opt/config/cloud_env.txt
+            echo "__external_dns__" > /opt/config/external_dns.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            echo "__aai1_ip_addr__" > /opt/config/aai_ip_addr.txt
+            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
+
+            # Download and run install script
+            apt-get -y install unzip
+            if [[ "__artifacts_version__" =~ "SNAPSHOT" ]]; then REPO=snapshots; else REPO=releases; fi
+            curl -k -L "__nexus_artifact_repo__/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.demo&a=boot&e=zip&v=__artifacts_version__" -o /opt/boot-__artifacts_version__.zip
+            unzip -j /opt/boot-__artifacts_version__.zip -d /opt nbi_install.sh
+            cd /opt
+            chmod +x nbi_install.sh
+            ./nbi_install.sh