Up flavor configuration for DCAE VMs
[demo.git] / heat / ONAP / onap_openstack.yaml
index 8258232..3ba7ffe 100644 (file)
@@ -3,7 +3,7 @@
 #==================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.
@@ -42,7 +42,11 @@ parameters:
   
   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
@@ -110,31 +114,39 @@ parameters:
 
   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 password or 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
 
   ######################
   #                    #
@@ -150,6 +162,10 @@ parameters:
     type: string
     description: First element of the dns_list for ONAP network
 
+  dns_forwarder:
+    type: string
+    description: the forwarder address for setting up ONAP's private DNS server
+
   oam_network_cidr:
     type: string
     description: CIDR of the OAM ONAP network
@@ -195,16 +211,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
+#  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
 
   ###########################
   #                         #
@@ -212,37 +228,77 @@ parameters:
   #                         #
   ###########################
 
-  dcae_base_environment:
+  dnsaas_config_enabled:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
+    description: whether the DNSaaS configuration section is enabled
 
-  dcae_zone:
+  dnsaas_region:
     type: string
-    description: DCAE Zone to use in VM names created by DCAE controller
+    description: the region of the cloud instance providing the Designate DNS as a Service
 
-  dcae_state:
+  dnsaas_keystone_url:
     type: string
-    description: DCAE State to use in VM names created by DCAE controller
+    description: the keystone URL of the cloud instance providing the Designate DNS as a Service
 
-  nexus_repo_root:
+  dnsaas_username:
     type: string
-    description: Root URL of Nexus repository
+    description: the username of the cloud instance providing the Designate DNS as a Service
 
-  nexus_url_snapshot:
+  dnsaas_password:
     type: string
-    description: Snapshot of Maven repository for DCAE deployment
+    description: the password of the cloud instance providing the Designate DNS as a Service
 
-  openstack_region:
+  dnsaas_tenant_name:
     type: string
-    description: Region where the DCAE controller will spin the VMs
+    description: the name of the tenant in the cloud instance providing the Designate DNS as a Service
+
+  dcae_keystone_url:
+    type: string
+    description: the keystone URL for DCAE to use (via MultiCloud)
+
+  dcae_private_key:
+    type: string
+    description: the private key of the key-apir used between the DCAE bootstrap container and DCAE VMs
 
-  gitlab_branch:
+  dcae_public_key:
     type: string
-    description: Branch of the Gitlab repository
-    
-  dcae_code_version:
+    description: the prublic key of the key-apir used between the DCAE bootstrap container and DCAE VMs
+
+  dcae_centos_7_image:
+    type: string
+    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)
+
+#  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
 
   #####################
   #                   #
@@ -315,8 +371,12 @@ parameters:
     type: string
   uui_docker:
     type: string
+  esr_docker:
+    type: string
   dgbuilder_docker:
     type: string
+  cli_docker:
+    type: string
 
   aai_branch:
     type: string
@@ -358,7 +418,6 @@ resources:
     properties:
       length: 4
 
-
   # Public key used to access ONAP components
   vm_key:
     type: OS::Nova::KeyPair
@@ -373,6 +432,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
@@ -459,6 +547,7 @@ resources:
             __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
 
@@ -485,6 +574,7 @@ resources:
             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
@@ -671,6 +761,7 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
+            __openo_ip__: { get_param: openo_ip_addr }
             __docker_version__: { get_param: so_docker }
             __gerrit_branch__: { get_param: so_branch }
             __cloud_env__: { get_param: cloud_env }
@@ -687,6 +778,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
@@ -786,7 +878,7 @@ resources:
     type: OS::Nova::Server
     properties:
       image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_small }
+      flavor: { get_param: flavor_medium }
       name:
         str_replace: 
           template: base-robot
@@ -830,6 +922,8 @@ resources:
             __external_dns__: { get_param: external_dns }
             __vm_image_name__: { get_param: ubuntu_1404_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 }
           template: |
             #!/bin/bash
@@ -867,6 +961,8 @@ resources:
             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 "__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
@@ -1127,6 +1223,7 @@ resources:
             __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
             __docker_version__: { get_param: portal_docker }
             __gerrit_branch__: { get_param: portal_branch }
+            __cli_docker__: { get_param: cli_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __portal_repo__: { get_param: portal_repo }
@@ -1144,6 +1241,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
@@ -1156,144 +1254,144 @@ resources:
 
 
   # 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: |
+#  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
+#            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
+#            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
@@ -1529,7 +1627,7 @@ resources:
       flavor: { get_param: flavor_xxlarge }
       name:
         str_replace:
-          template: base-openo-server
+          template: base-multi-service
           params:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
@@ -1568,6 +1666,7 @@ resources:
             __mvim_docker__: { get_param: mvim_docker }
             __vfc_docker__: { get_param: vfc_docker }
             __uui_docker__: { get_param: uui_docker }
+            __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
           template: |
             #!/bin/bash
@@ -1588,6 +1687,7 @@ resources:
             echo "__mvim_docker__" > /opt/config/mvim_docker.txt
             echo "__vfc_docker__" > /opt/config/vfc_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
 
             # Create env file with the IP address of all ONAP components
@@ -1611,4 +1711,176 @@ resources:
             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
\ No newline at end of file
+            ./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 }}]
+
+  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 }
+            __dcae_repo__: { get_param: dcae_repo }
+            __gerrit_branch__: { get_param: dcae_branch }
+            # 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_xlarge }
+            __dcaeos_flavor_id_cdap__: { get_param: flavor_xlarge }
+            __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 "__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 "__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