Version bump demo artifacts to 1.3.0-SNAPSHOT

Also remove deprecated ONAP template Change-Id: I6d1b927e00fe1297121fe60c742a5a00964c139d Issue-ID: INT-506 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
author: Gary Wu <gary.i.wu@huawei.com> 2018-06-26 08:08:55 -0700
committer: Gary Wu <gary.i.wu@huawei.com> 2018-06-26 08:12:06 -0700
commit: fd761391ba59ba11452270807033e3605da5c6a4 (patch)
tree: 3502ba0434c1fefa22ba7839c66c9a799dba3726
parent: 2d4018ebc025bdbc072f9d01ddd4b1fda9a39c30 (diff)
18 files changed, 12 insertions, 5227 deletions
diff --git a/heat/ONAP/deprecated/onap_openstack_float.env b/heat/ONAP/deprecated/onap_openstack_float.env
deleted file mode 100644
index 25517f8d..00000000
--- a/heat/ONAP/deprecated/onap_openstack_float.env
+++ /dev/null
@@ -1,206 +0,0 @@
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id: PUT YOUR NETWORK ID/NAME HERE
-
-  public_subnet_id: PUT PUBLIC SUBNET ID HERE
-
-  router_gateway_ip: PUT ROUTER GATEWAY PUBLIC IP HERE
-
-  ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
-
-  ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
-
-  centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE
-
-  flavor_small: PUT THE SMALL FLAVOR NAME HERE
-
-  flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
-
-  flavor_large: PUT THE LARGE FLAVOR NAME HERE
-
-  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
-
-  flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE
-
-  security_group: PUT THE NAME OF THE SECURITY GROUP HERE
-
-  vm_base_name: vm1
-
-  key_name: onap_key
-
-  dcae_key_name: dcae_key
-
-  pub_key: PUT YOUR PUBLIC KEY HERE
-
-  dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE
-
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: docker
-
-  nexus_password: docker
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.1.0-SNAPSHOT
-
-  openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
-
-  openstack_username: PUT YOUR OPENSTACK USERNAME HERE
-
-  openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
-
-  openstack_auth_method: password
-
-  openstack_region: RegionOne
-
-  horizon_url: PUT THE HORIZON URL HERE
-
-  keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
-
-  cloud_env: openstack
-
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems)
-  external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE
-  oam_network_cidr: 10.0.0.0/16
-
-  ### Floating IP addresses ###
-
-  aai1_float_ip: PUT A&AI INSTANCE 1 FLOATING IP HERE
-  aai2_float_ip: PUT A&AI INSTANCE 2 FLOATING IP HERE
-  appc_float_ip: PUT APP-C FLOATING IP HERE
-  dcae_float_ip: PUT DCAE FLOATING IP HERE
-  dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE
-  dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE
-  dcae_hdp1_float_ip: PUT DCAE HADOOP VM1 FLOATING IP HERE
-  dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE
-  dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE
-  dns_float_ip: PUT DNS FLOATING IP HERE
-  so_float_ip: PUT SO FLOATING IP HERE
-  mr_float_ip: PUT MESSAGE ROUTER FLOATING IP HERE
-  policy_float_ip: PUT POLICY FLOATING IP HERE
-  portal_float_ip: PUT PORTAL FLOATING IP HERE
-  robot_float_ip: PUT ROBOT FLOATING IP HERE
-  sdc_float_ip: PUT SDC FLOATING IP HERE
-  sdnc_float_ip: PUT SDN-C FLOATING IP HERE
-  vid_float_ip: PUT VID FLOATING IP HERE
-  clamp_float_ip: PUT CLAMP FLOATING IP HERE
-  openo_float_ip: PUT OPEN-O FLOATING IP HERE
-
-  ### Private IP addresses ###
-
-  aai1_ip_addr: 10.0.1.1
-  aai2_ip_addr: 10.0.1.2
-  appc_ip_addr: 10.0.2.1
-  dcae_ip_addr: 10.0.4.1
-  dcae_coll_ip_addr: 10.0.4.102
-  dcae_db_ip_addr: 10.0.4.101
-  dcae_hdp1_ip_addr: 10.0.4.103
-  dcae_hdp2_ip_addr: 10.0.4.104
-  dcae_hdp3_ip_addr: 10.0.4.105
-  dns_ip_addr: 10.0.100.1
-  so_ip_addr: 10.0.5.1
-  mr_ip_addr: 10.0.11.1
-  policy_ip_addr: 10.0.6.1
-  portal_ip_addr: 10.0.9.1
-  robot_ip_addr: 10.0.10.1
-  sdc_ip_addr: 10.0.3.1
-  sdnc_ip_addr: 10.0.7.1
-  vid_ip_addr: 10.0.8.1
-  clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_base_environment: 1-NIC-FLOATING-IPS
-
-  dcae_zone: ZONE
-
-  dcae_state: STATE
-
-  nexus_repo_root: https://nexus.onap.org
-
-  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
-  gitlab_branch: master
-
-  dcae_code_version: 1.1.0
-
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  #                              #
-  ################################
-
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  dcae_branch: master
-  policy_branch: master
-  portal_branch: release-1.3.0
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-
-  aai_docker: 1.1-STAGING-latest
-  appc_docker: 1.1-STAGING-latest
-  so_docker: 1.1-STAGING-latest
-  mr_docker: 1.1-STAGING-latest
-  dcae_docker: 1.1-latest
-  policy_docker: 1.1-STAGING-latest
-  portal_docker: v1.3.0
-  robot_docker: 1.1-STAGING-latest
-  sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-STAGING-latest
-  vid_docker: 1.1-STAGING-latest
-  clamp_docker: 1.1-STAGING-latest
-  msb_docker: latest
-  mvim_docker: latest
-  vfc_docker: latest
-  uui_docker: latest
-  esr_docker: latest
-  dgbuilder_docker: 0.1-STAGING-latest
-  cli_docker: v1.1.0
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-  aai_repo: http://gerrit.onap.org/r/aai/test-config
-  appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
-  so_repo: http://gerrit.onap.org/r/so/docker-config.git
-  policy_repo: http://gerrit.onap.org/r/policy/docker.git
-  portal_repo: http://gerrit.onap.org/r/portal.git
-  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
-  sdc_repo: http://gerrit.onap.org/r/sdc.git
-  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
-  vid_repo: http://gerrit.onap.org/r/vid.git
-  clamp_repo: http://gerrit.onap.org/r/clamp.git
-  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
diff --git a/heat/ONAP/deprecated/onap_openstack_float.yaml b/heat/ONAP/deprecated/onap_openstack_float.yaml
deleted file mode 100644
index 01f160ab..00000000
--- a/heat/ONAP/deprecated/onap_openstack_float.yaml
+++ /dev/null
@@ -1,1815 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-# 
-#
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2015-10-15
-
-description: Heat template to install ONAP components
-
-##############
-#            #
-# PARAMETERS #
-#            #
-##############
-
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id:
-    type: string
-    description: Public network for floating IP address allocation
-
-  public_subnet_id:
-    type: string
-    description: Public subnet for floating IP address allocation
-
-  router_gateway_ip:
-    type: string
-    description: Router gateway IP address
-
-  ubuntu_1404_image:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
-  ubuntu_1604_image:
-    type: string
-    description: Name of the Ubuntu 16.04 image
-
-  centos_7_image:
-    type: string
-    description: Name of the CentOS 7 image
-
-  flavor_small:
-    type: string
-    description: Name of the Small Flavor supported by the cloud provider
-
-  flavor_medium:
-    type: string
-    description: Name of the Medium Flavor supported by the cloud provider
-
-  flavor_large:
-    type: string
-    description: Name of the Large Flavor supported by the cloud provider
-
-  flavor_xlarge:
-    type: string
-    description: Name of the Extra Large Flavor supported by the cloud provider
-
-  flavor_xxlarge:
-    type: string
-    description: Name of the Extra Extra Large Flavor supported by the cloud provider
-
-  security_group:
-    type: string
-    description: Security group used by DCAE GEN 2
-
-  vm_base_name:
-    type: string
-    description: Base name of ONAP VMs
-
-  key_name:
-    type: string
-    description: Public/Private key pair name
-
-  dcae_key_name:
-    type: string
-    description: Public/Private key pair name for DCAE GEN 2
-
-  pub_key:
-    type: string
-    description: Public key to be installed on the compute instance
-
-  dcae_pub_key:
-    type: string
-    description: Public key to be installed on the DCAE GEN 2 compute instance
-
-  nexus_repo:
-    type: string
-    description: Complete URL for the Nexus repository.
-
-  nexus_docker_repo:
-    type: string
-    description: Complete URL for the Nexus repository for docker images.
-
-  nexus_username:
-    type: string
-    description: Nexus Repository username
-
-  nexus_password:
-    type: string
-    description: Nexus Repository Password
-
-  artifacts_version:
-    type: string
-    description: Artifacts version of ONAP components
-
-  dmaap_topic:
-    type: string
-    description: DMaaP Topic name
-
-  openstack_tenant_id:
-    type: string
-    description: Openstack tenant ID
-
-  openstack_username:
-    type: string
-    description: Openstack username
-
-  openstack_auth_method:
-    type: string
-    description: Openstack authentication method (password VS. api-key)
-
-  openstack_api_key:
-    type: string
-    description: Openstack password or API Key
-
-  horizon_url:
-    type: string
-    description: URL of Openstack Horizon
-
-  keystone_url:
-    type: string
-    description: URL of Openstack Keystone
-
-  cloud_env:
-    type: string
-    description: Cloud Provider Name
-
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  dns_list:
-    type: comma_delimited_list
-    description: List of External DNS for OAM ONAP network
-
-  external_dns:
-    type: string
-    description: First element of the dns_list for ONAP network
-
-  oam_network_cidr:
-    type: string
-    description: CIDR of the OAM ONAP network
-
-  ### Floating IP addresses ###
-  aai1_float_ip:
-    type: string
-  aai2_float_ip:
-    type: string
-  appc_float_ip:
-    type: string
-  dcae_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
-  dns_float_ip:
-    type: string
-  so_float_ip:
-    type: string
-  mr_float_ip:
-    type: string
-  policy_float_ip:
-    type: string
-  portal_float_ip:
-    type: string
-  robot_float_ip:
-    type: string
-  sdc_float_ip:
-    type: string
-  sdnc_float_ip:
-    type: string
-  vid_float_ip:
-    type: string
-  clamp_float_ip:
-    type: string
-  openo_float_ip:
-    type: string
- 
-  ### Private IP addresses ###
-
-  aai1_ip_addr:
-    type: string
-  aai2_ip_addr:
-    type: string
-  appc_ip_addr:
-    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:
-    type: string
-  mr_ip_addr:
-    type: string
-  policy_ip_addr:
-    type: string
-  portal_ip_addr:
-    type: string
-  robot_ip_addr:
-    type: string
-  sdc_ip_addr:
-    type: string
-  sdnc_ip_addr:
-    type: string
-  vid_ip_addr:
-    type: string
-  clamp_ip_addr:
-    type: string
-  openo_ip_addr:
-    type: string
-
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  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
-
-  openstack_region:
-    type: string
-    description: Region where the DCAE controller will spin the VMs
-
-  gitlab_branch:
-    type: string
-    description: Branch of the Gitlab repository
-    
-  dcae_code_version:
-    type: string
-    description: DCAE Code Version Number
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-
-  aai_repo:
-    type: string
-  appc_repo:
-    type: string
-  dcae_repo:
-    type: string
-  mr_repo:
-    type: string
-  so_repo:
-    type: string
-  policy_repo:
-    type: string
-  portal_repo:
-    type: string
-  robot_repo:
-    type: string
-  sdc_repo:
-    type: string
-  sdnc_repo:
-    type: string
-  vid_repo:
-    type: string
-  clamp_repo:
-    type: string
-  vnfsdk_repo:
-    type: string
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  #                              #
-  ################################
-
-  aai_docker:
-    type: string
-  appc_docker:
-    type: string
-  so_docker:
-    type: string
-  mr_docker:
-    type: string
-  dcae_docker:
-    type: string
-  policy_docker:
-    type: string
-  portal_docker:
-    type: string
-  robot_docker:
-    type: string
-  sdc_docker:
-    type: string
-  sdnc_docker:
-    type: string
-  vid_docker:
-    type: string
-  clamp_docker:
-    type: string
-  msb_docker:
-    type: string
-  mvim_docker:
-    type: string
-  vfc_docker:
-    type: string
-  uui_docker:
-    type: string
-  esr_docker:
-    type: string
-  dgbuilder_docker:
-    type: string
-  cli_docker:
-    type: string
-
-  aai_branch:
-    type: string
-  appc_branch:
-    type: string
-  so_branch:
-    type: string
-  mr_branch:
-    type: string
-  dcae_branch:
-    type: string
-  policy_branch:
-    type: string
-  portal_branch:
-    type: string
-  robot_branch:
-    type: string
-  sdc_branch:
-    type: string
-  sdnc_branch:
-    type: string
-  vid_branch:
-    type: string
-  clamp_branch:
-    type: string
-  vnfsdk_branch:
-    type: string
-
-
-#############
-#           #
-# RESOURCES #
-#           #
-#############
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-
-  # Public key used to access ONAP components
-  vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-  # Public key used to access DCAE GEN 2
-  dcae_vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: dcae_key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: dcae_pub_key }
-      save_private_key: true
-
-  # ONAP management private network
-  oam_onap:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-
-  oam_onap_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-      network_id: { get_resource: oam_onap }
-      cidr: { get_param: oam_network_cidr }
-      dns_nameservers: { get_param: dns_list }
-
-  router:
-    type: OS::Neutron::Router
-    properties:
-      external_gateway_info:
-        network: { get_param: public_net_id }
-        external_fixed_ips:
-          - ip_address: { get_param: router_gateway_ip }
-            subnet: { get_param: public_subnet_id }
-
-  router_interface:
-    type: OS::Neutron::RouterInterface
-    properties:
-      router_id: { get_resource: router }
-      subnet_id: { get_resource: oam_onap_subnet }
-
-
-  # DNS Server instantiation
-  dns_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dns_ip_addr }}]
-
-  dns_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: dns_private_port }
-      floating_ip_address: { get_param: dns_float_ip }
-
-  dns_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_small }
-      name:
-        str_replace:
-          template: base-dns-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: dns_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __artifacts_version__: { get_param: artifacts_version }
-            __oam_network_cidr__: { get_attr: [oam_onap_subnet, cidr] }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __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 }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_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
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__robot_ip_addr__" > /opt/config/robot_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-            echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
-            cd /opt
-            chmod +x dns_install.sh
-            ./dns_install.sh
-
-
-  # A&AI instantiation (2 VMs)
-  aai1_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai1_ip_addr }}]
-
-  aai1_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aai1_private_port }
-      floating_ip_address: { get_param: aai1_float_ip }
-
-  aai1_vm:
-    type: OS::Nova::Server
-    depends_on: aai2_vm
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst1
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: aai1_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: aai_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __gerrit_branch__: { get_param: aai_branch }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_1" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  aai2_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai2_ip_addr }}]
-
-  aai2_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aai2_private_port }
-      floating_ip_address: { get_param: aai2_float_ip }
-
-  aai2_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst2
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: aai2_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: aai_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __gerrit_branch__: { get_param: aai_branch }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_2" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  # SO instantiation
-  so_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}]
-
-  so_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: so_private_port }
-      floating_ip_address: { get_param: so_float_ip }
-
-  so_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-so
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: so_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: so_docker }
-            __gerrit_branch__: { get_param: so_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __so_repo__: { get_param: so_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__so_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
-            cd /opt
-            chmod +x so_install.sh
-            ./so_install.sh
-
-
-  # Message Router instantiation
-  mrouter_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mr_ip_addr }}]
-
-  mrouter_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: mrouter_private_port }
-      floating_ip_address: { get_param: mr_float_ip }
-
-  mrouter_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-message-router
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: mrouter_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __gerrit_branch__: { get_param: mr_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __mr_repo__: { get_param: mr_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__mr_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
-            cd /opt
-            chmod +x mr_install.sh
-            ./mr_install.sh
-
-
-  # Robot Framework instantiation
-  robot_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: robot_ip_addr }}]
-
-  robot_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: robot_private_port }
-      floating_ip_address: { get_param: robot_float_ip }
- 
-  robot_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace: 
-          template: base-robot
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: robot_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __network_name__: { get_attr: [oam_onap, name] }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __artifacts_version__: { get_param: artifacts_version }
-            __openstack_region__: { get_param: openstack_region }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: robot_docker }
-            __gerrit_branch__: { get_param: robot_branch }
-            __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 }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vm_image_name__: { get_param: ubuntu_1404_image }
-            __vm_flavor__: { get_param: flavor_medium }
-            __robot_repo__: { get_param: robot_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__network_name__" > /opt/config/network.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_password.txt
-            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
-            echo "__openstack_region__" > /opt/config/region.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-            echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
-            echo "__vm_flavor__" > /opt/config/vm_flavor.txt
-            echo "__robot_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
-            cd /opt
-            chmod +x robot_install.sh
-            ./robot_install.sh
-
-
-  # VID instantiation
-  vid_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: vid_ip_addr }}]
-
-  vid_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: vid_private_port }
-      floating_ip_address: { get_param: vid_float_ip }
-
-  vid_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace: 
-          template: base-vid
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: vid_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: vid_docker }
-            __gerrit_branch__: { get_param: vid_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vid_repo__: { get_param: vid_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            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
-            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 }}]
-
-  sdnc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: sdnc_private_port }
-      floating_ip_address: { get_param: sdnc_float_ip }
-
-  sdnc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-sdnc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: sdnc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: sdnc_docker }
-            __gerrit_branch__: { get_param: sdnc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdnc_repo__: { get_param: sdnc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sdnc_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
-            cd /opt
-            chmod +x sdnc_install.sh
-            ./sdnc_install.sh
-
-
-  # SDC instantiation
-  sdc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
-
-  sdc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: sdc_private_port }
-      floating_ip_address: { get_param: sdc_float_ip }
-
-  sdc_volume_data:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-data
-      size: 100
-
-  sdc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace: 
-          template: base-sdc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: sdc_private_port }
-      block_device_mapping:
-        - device_name: /dev/vdb
-          volume_id: {get_resource: sdc_volume_data}
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __env_name__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: sdc_docker }
-            __gerrit_branch__: { get_param: sdc_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdc_repo__: { get_param: sdc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__env_name__" > /opt/config/env_name.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__public_ip__" > /opt/config/public_ip.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            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
-            cd /opt
-            chmod +x sdc_install.sh
-            ./sdc_install.sh
-
-
-  # PORTAL instantiation
-  portal_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: portal_ip_addr }}]
-
-  portal_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: portal_private_port }
-      floating_ip_address: { get_param: portal_float_ip }
-
-  portal_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-portal
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: portal_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: portal_docker }
-            __gerrit_branch__: { get_param: portal_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __cli_docker__: { get_param: cli_docker }
-            __external_dns__: { get_param: external_dns }
-            __portal_repo__: { get_param: portal_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 "__public_ip__" > /opt/config/public_ip.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cli_docker__" > /opt/config/cli_docker_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__portal_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
-            cd /opt
-            chmod +x portal_install.sh
-            ./portal_install.sh
-
-
-  # DCAE Controller instantiation
-#  dcae_c_private_port:
-#    type: OS::Neutron::Port
-#    properties:
-#      network: { get_resource: oam_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 }
-#      floating_ip_address: { get_param: dcae_float_ip }
-
-#  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_param: dcae_float_ip }
-#            __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 }}]
-
-  policy_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: policy_private_port }
-      floating_ip_address: { get_param: policy_float_ip }
-
-  policy_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace: 
-          template: base-policy
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: policy_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] }
-            __docker_version__: { get_param: policy_docker }
-            __gerrit_branch__: { get_param: policy_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __policy_repo__: { get_param: policy_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__public_ip__" > /opt/config/public_ip.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            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
-            cd /opt
-            chmod +x policy_install.sh
-            ./policy_install.sh
-
-
-  # APP-C instantiation
-  appc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}]
-
-  appc_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: appc_private_port }
-      floating_ip_address: { get_param: appc_float_ip }
-
-  appc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-appc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: appc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: appc_docker }
-            __gerrit_branch__: { get_param: appc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __appc_repo__: { get_param: appc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__appc_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
-            cd /opt
-            chmod +x appc_install.sh
-            ./appc_install.sh
-
-
-  # CLAMP instantiation
-  clamp_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}]
-
-  clamp_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: clamp_private_port }
-      floating_ip_address: { get_param: clamp_float_ip }
-
-  clamp_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace:
-          template: base-clamp
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: clamp_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __docker_version__: { get_param: clamp_docker }
-            __gerrit_branch__: { get_param: clamp_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __clamp_repo__: { get_param: clamp_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__clamp_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
-            cd /opt
-            chmod +x clamp_install.sh
-            ./clamp_install.sh
-
-
-  # OPEN-O VM instantiation
-  openo_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}]
-
-  openo_floating_ip:
-    type: OS::Neutron::FloatingIP
-    properties:
-      floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: openo_private_port }
-      floating_ip_address: { get_param: openo_float_ip }
-
-  openo_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xxlarge }
-      name:
-        str_replace:
-          template: base-openo-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - port: { get_resource: openo_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __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 }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vnfsdk_branch__: { get_param: vnfsdk_branch }
-            __msb_docker__: { get_param: msb_docker }
-            __mvim_docker__: { get_param: mvim_docker }
-            __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
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
-            echo "__msb_docker__" > /opt/config/msb_docker.txt
-            echo "__mvim_docker__" > /opt/config/mvim_docker.txt
-            echo "__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
-            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
-            echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
-            cd /opt
-            chmod +x openo_install.sh
-            ./openo_install.sh
-
-
-  # DCAE GEN 2 Controller instantiation
-  dcae_c_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
-
-  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_medium }
-      name:
-        str_replace: 
-          template: base-dcae-controller
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: dcae_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 }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __dcae_zone__: { get_param: dcae_zone }
-            __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 }
-            __key_name__: { get_param: dcae_key_name }
-            __pub_key__: { get_param: dcae_pub_key }
-            __private_key__: { get_attr: [ dcae_vm_key, private_key ] }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __docker_version__: { get_param: dcae_docker }
-            __dcae_repo__: { get_param: dcae_repo }
-            __gerrit_branch__: { get_param: dcae_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __public_net_id__: { get_param: public_net_id }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
-            __external_dns__: { get_param: external_dns }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __centos_7_image__: { get_param: centos_7_image }
-            __security_group__ : { get_param: security_group }
-            __flavor_medium__: { get_param: flavor_medium }
-            __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
-            __rand_str__: { get_resource: random-str }
-
-          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 "__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 "__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 "__key_name__" > /opt/config/key_name.txt
-            echo "__pub_key__" > /opt/config/pub_key.txt
-            echo "__private_key__" > /opt/config/priv_key
-            echo "__openstack_region__" > /opt/config/openstack_region.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_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-            echo "__centos_7_image__" > /opt/config/centos_7_image.txt
-            echo "__security_group__" > /opt/config/security_group.txt
-            echo "__flavor_medium__" > /opt/config/flavor_medium.txt
-            echo "__dcae_repo__" > /opt/config/remote_repo.txt
-            echo "__mac_addr__" > /opt/config/mac_addr.txt
-            echo "__rand_str__" > /opt/config/rand_str.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
-\ No newline at end of file
diff --git a/heat/ONAP/deprecated/onap_openstack_nofloat.env b/heat/ONAP/deprecated/onap_openstack_nofloat.env
deleted file mode 100644
index 49abd664..00000000
--- a/heat/ONAP/deprecated/onap_openstack_nofloat.env
+++ /dev/null
@@ -1,178 +0,0 @@
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-
-  public_net_id: PUT YOUR NETWORK ID/NAME HERE
-
-  ubuntu_1404_image: PUT THE UBUNTU 14.04 IMAGE NAME HERE
-
-  ubuntu_1604_image: PUT THE UBUNTU 16.04 IMAGE NAME HERE
-
-  centos_7_image: PUT THE CENTOS 7 IMAGE NAME HERE
-
-  flavor_small: PUT THE SMALL FLAVOR NAME HERE
-
-  flavor_medium: PUT THE MEDIUM FLAVOR NAME HERE
-
-  flavor_large: PUT THE LARGE FLAVOR NAME HERE
-
-  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
-
-  flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE
-
-  security_group: PUT THE NAME OF THE SECURITY GROUP HERE
-
-  vm_base_name: vm1
-
-  key_name: onap_key
-
-  dcae_key_name: dcae_key
-
-  pub_key: PUT YOUR PUBLIC KEY HERE
-
-  dcae_pub_key: PUT YOUR DCAE PUBLIC KEY HERE
-
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: docker
-
-  nexus_password: docker
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.1.0-SNAPSHOT
-
-  openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
-
-  openstack_username: PUT YOUR OPENSTACK USERNAME HERE
-
-  openstack_api_key: PUT YOUR OPENSTACK PASSWORD HERE
-
-  openstack_auth_method: password
-
-  openstack_region: RegionOne
-
-  horizon_url: PUT THE HORIZON URL HERE
-
-  keystone_url: PUT THE KEYSTONE URL HERE (do not include version number)
-
-  cloud_env: openstack_nofloat
-
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE
-  oam_network_cidr: 10.0.0.0/16
-
-  ### Private IP addresses ###
-
-  aai1_ip_addr: 10.0.1.1
-  aai2_ip_addr: 10.0.1.2
-  appc_ip_addr: 10.0.2.1
-  dcae_ip_addr: 10.0.4.1
-  dcae_coll_ip_addr: 10.0.4.102
-  dcae_db_ip_addr: 10.0.4.101
-  dcae_hdp1_ip_addr: 10.0.4.103
-  dcae_hdp2_ip_addr: 10.0.4.104
-  dcae_hdp3_ip_addr: 10.0.4.105
-  dns_ip_addr: 10.0.100.1
-  so_ip_addr: 10.0.5.1
-  mr_ip_addr: 10.0.11.1
-  policy_ip_addr: 10.0.6.1
-  portal_ip_addr: 10.0.9.1
-  robot_ip_addr: 10.0.10.1
-  sdc_ip_addr: 10.0.3.1
-  sdnc_ip_addr: 10.0.7.1
-  vid_ip_addr: 10.0.8.1
-  clamp_ip_addr: 10.0.12.1
-  openo_ip_addr: 10.0.14.1
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  dcae_base_environment: 2-NIC
-
-  dcae_zone: bm01
-
-  dcae_state: nj
-
-  nexus_repo_root: https://nexus.onap.org
-
-  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
-  gitlab_branch: master
-
-  dcae_code_version: 1.1.0
-
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  #                              #
-  ################################
-
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  dcae_branch: master
-  policy_branch: master
-  portal_branch: release-1.3.0
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-  vnfsdk_branch: master
-
-  aai_docker: 1.1-STAGING-latest
-  appc_docker: 1.1-STAGING-latest
-  so_docker: 1.1-STAGING-latest
-  mr_docker: 1.1-STAGING-latest
-  dcae_docker: 1.1-latest
-  policy_docker: 1.1-STAGING-latest
-  portal_docker: v1.3.0
-  robot_docker: 1.1-STAGING-latest
-  sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-STAGING-latest
-  vid_docker: 1.1-STAGING-latest
-  clamp_docker: 1.1-STAGING-latest
-  msb_docker: latest
-  mvim_docker: latest
-  vfc_docker: latest
-  uui_docker: latest
-  esr_docker: latest
-  dgbuilder_docker: 0.1-STAGING-latest
-  cli_docker: v1.1.0
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-  aai_repo: http://gerrit.onap.org/r/aai/test-config
-  appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git 
-  so_repo: http://gerrit.onap.org/r/so/docker-config.git
-  policy_repo: http://gerrit.onap.org/r/policy/docker.git
-  portal_repo: http://gerrit.onap.org/r/portal.git
-  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
-  sdc_repo: http://gerrit.onap.org/r/sdc.git
-  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
-  vid_repo: http://gerrit.onap.org/r/vid.git
-  clamp_repo: http://gerrit.onap.org/r/clamp.git
-  vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git
diff --git a/heat/ONAP/deprecated/onap_openstack_nofloat.yaml b/heat/ONAP/deprecated/onap_openstack_nofloat.yaml
deleted file mode 100644
index 136b1606..00000000
--- a/heat/ONAP/deprecated/onap_openstack_nofloat.yaml
+++ /dev/null
@@ -1,1680 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-# 
-#
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to install ONAP components
-
-##############
-#            #
-# PARAMETERS #
-#            #
-##############
-
-parameters:
-
-  ##############################################
-  #                                            #
-  # Parameters used across all ONAP components #
-  #                                            #
-  ##############################################
-  
-  public_net_id:
-    type: string
-    description: Public network for floating IP address allocation
-
-  ubuntu_1404_image:
-    type: string
-    description: Name of the Ubuntu 14.04 image
-
-  ubuntu_1604_image:
-    type: string
-    description: Name of the Ubuntu 16.04 image
-
-  centos_7_image:
-    type: string
-    description: Name of the CentOS 7 image
-
-  flavor_small:
-    type: string
-    description: Name of the Small Flavor supported by the cloud provider
-
-  flavor_medium:
-    type: string
-    description: Name of the Medium Flavor supported by the cloud provider
-
-  flavor_large:
-    type: string
-    description: Name of the Large Flavor supported by the cloud provider
-
-  flavor_xlarge:
-    type: string
-    description: Name of the Extra Large Flavor supported by the cloud provider
-
-  flavor_xxlarge:
-    type: string
-    description: Name of the Extra Extra Large Flavor supported by the cloud provider
-
-  security_group:
-    type: string
-    description: Security group used by DCAE GEN 2
-
-  vm_base_name:
-    type: string
-    description: Base name of ONAP VMs
-
-  key_name:
-    type: string
-    description: Public/Private key pair name
-
-  dcae_key_name:
-    type: string
-    description: Public/Private key pair name for DCAE GEN 2
-
-  pub_key:
-    type: string
-    description: Public key to be installed on the compute instance
-
-  dcae_pub_key:
-    type: string
-    description: Public key to be installed on the DCAE GEN 2 compute instance
-
-  nexus_repo:
-    type: string
-    description: Complete URL for the Nexus repository.
-
-  nexus_docker_repo:
-    type: string
-    description: Complete URL for the Nexus repository for docker images.
-
-  nexus_username:
-    type: string
-    description: Nexus Repository username
-
-  nexus_password:
-    type: string
-    description: Nexus Repository Password
-
-  artifacts_version:
-    type: string
-    description: Artifacts version of ONAP components
-
-  dmaap_topic:
-    type: string
-    description: DMaaP Topic name
-
-  openstack_tenant_id:
-    type: string
-    description: Openstack tenant ID
-
-  openstack_username:
-    type: string
-    description: Openstack username
-
-  openstack_auth_method:
-    type: string
-    description: Openstack authentication method (password VS. api-key)
-
-  openstack_api_key:
-    type: string
-    description: Openstack password or API Key
-
-  horizon_url:
-    type: string
-    description: URL of Openstack Horizon
-
-  keystone_url:
-    type: string
-    description: URL of Openstack Keystone
-
-  cloud_env:
-    type: string
-    description: Cloud Provider Name
-
-  ######################
-  #                    #
-  # Network parameters #
-  #                    #
-  ######################
-
-  external_dns:
-    type: string
-    description: External DNS for OAM ONAP network
-
-  oam_network_cidr:
-    type: string
-    description: CIDR of the OAM ONAP network
-
-  ### Private IP addresses ###
-
-  aai1_ip_addr:
-    type: string
-  aai2_ip_addr:
-    type: string
-  appc_ip_addr:
-    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:
-    type: string
-  mr_ip_addr:
-    type: string
-  policy_ip_addr:
-    type: string
-  portal_ip_addr:
-    type: string
-  robot_ip_addr:
-    type: string
-  sdc_ip_addr:
-    type: string
-  sdnc_ip_addr:
-    type: string
-  vid_ip_addr:
-    type: string
-  clamp_ip_addr:
-    type: string
-  openo_ip_addr:
-    type: string
-
-  ###########################
-  #                         #
-  # Parameters used by DCAE #
-  #                         #
-  ###########################
-
-  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
-
-  openstack_region:
-    type: string
-    description: Region where the DCAE controller will spin the VMs
-
-  gitlab_branch:
-    type: string
-    description: Branch of the Gitlab repository
-    
-  dcae_code_version:
-    type: string
-    description: DCAE Code Version Number
-
-  #####################
-  #                   #
-  # ONAP repositories #
-  #                   #
-  #####################
-
-  aai_repo:
-    type: string
-  appc_repo:
-    type: string
-  dcae_repo:
-    type: string
-  mr_repo:
-    type: string
-  so_repo:
-    type: string
-  policy_repo:
-    type: string
-  portal_repo:
-    type: string
-  robot_repo:
-    type: string
-  sdc_repo:
-    type: string
-  sdnc_repo:
-    type: string
-  vid_repo:
-    type: string
-  clamp_repo:
-    type: string
-  vnfsdk_repo:
-    type: string
-
-  ################################
-  #                              #
-  # Docker versions and branches #
-  #                              #
-  ################################
-
-  aai_docker:
-    type: string
-  appc_docker:
-    type: string
-  so_docker:
-    type: string
-  mr_docker:
-    type: string
-  dcae_docker:
-    type: string
-  policy_docker:
-    type: string
-  portal_docker:
-    type: string
-  robot_docker:
-    type: string
-  sdc_docker:
-    type: string
-  sdnc_docker:
-    type: string
-  vid_docker:
-    type: string
-  clamp_docker:
-    type: string
-  msb_docker:
-    type: string
-  mvim_docker:
-    type: string
-  vfc_docker:
-    type: string
-  uui_docker:
-    type: string
-  esr_docker:
-    type: string
-  dgbuilder_docker:
-    type: string
-  cli_docker:
-    type: string
-
-  aai_branch:
-    type: string
-  appc_branch:
-    type: string
-  so_branch:
-    type: string
-  mr_branch:
-    type: string
-  dcae_branch:
-    type: string
-  policy_branch:
-    type: string
-  portal_branch:
-    type: string
-  robot_branch:
-    type: string
-  sdc_branch:
-    type: string
-  sdnc_branch:
-    type: string
-  vid_branch:
-    type: string
-  clamp_branch:
-    type: string
-  vnfsdk_branch:
-    type: string
-
-
-#############
-#           #
-# RESOURCES #
-#           #
-#############
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-
-  # Public key used to access ONAP components
-  vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-  # Public key used to access DCAE GEN 2
-  dcae_vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: dcae_key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: dcae_pub_key }
-      save_private_key: true
-
-  # ONAP management private network
-  oam_onap:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-
-  oam_onap_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-      network_id: { get_resource: oam_onap }
-      cidr: { get_param: oam_network_cidr }
-
-
-  # DNS Server instantiation
-  dns_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dns_ip_addr }}]
-
-  dns_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_small }
-      name:
-        str_replace:
-          template: base-dns-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dns_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __artifacts_version__: { get_param: artifacts_version }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __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_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 }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_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
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__robot_ip_addr__" > /opt/config/robot_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-            echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
-            cd /opt
-            chmod +x dns_install.sh
-            ./dns_install.sh
-
-
-  # A&AI instantiation (2 VMs)
-  aai1_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai1_ip_addr }}]
-
-  aai1_vm:
-    type: OS::Nova::Server
-    depends_on: aai2_vm
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst1
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: aai1_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __aai_ip_addr__: { get_param: aai1_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__aai_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_1" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  aai2_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: aai2_ip_addr }}]
-
-  aai2_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-aai-inst2
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: aai2_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __aai_ip_addr__: { get_param: aai2_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __aai_repo__: { get_param: aai_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__aai_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_2" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__aai_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  # SO instantiation
-  so_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: so_ip_addr }}]
-
-  so_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace:
-          template: base-so
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: so_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: so_docker }
-            __gerrit_branch__: { get_param: so_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __so_repo__: { get_param: so_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__so_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__so_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh
-            cd /opt
-            chmod +x so_install.sh
-            ./so_install.sh
-
-
-  # Message Router instantiation
-  mrouter_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mr_ip_addr }}]
-
-  mrouter_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-message-router
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: mrouter_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __gerrit_branch__: { get_param: mr_gerrit }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__mr_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__mr_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
-            cd /opt
-            chmod +x mr_install.sh
-            ./mr_install.sh
-
-
-  # Robot Framework instantiation
-  robot_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: robot_ip_addr }}]
- 
-  robot_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace: 
-          template: base-robot
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: robot_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __network_name__: { get_attr: [oam_onap, name] }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __artifacts_version__: { get_param: artifacts_version }
-            __openstack_region__: { get_param: openstack_region }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: robot_docker }
-            __gerrit_branch__: { get_param: robot_branch }
-            __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 }
-            __so_ip_addr__: { get_param: so_ip_addr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vm_image_name__: { get_param: ubuntu_1404_image }
-            __vm_flavor__: { get_param: flavor_medium }
-            __robot_repo__: { get_param: robot_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__network_name__" > /opt/config/network.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_password.txt
-            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
-            echo "__openstack_region__" > /opt/config/region.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__robot_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt
-            echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt
-            echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt
-            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
-            echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt
-            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
-            echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt
-            echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt
-            echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt
-            echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vm_image_name__" > /opt/config/vm_image_name.txt
-            echo "__vm_flavor__" > /opt/config/vm_flavor.txt
-            echo "__robot_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
-            cd /opt
-            chmod +x robot_install.sh
-            ./robot_install.sh
-
-
-  # VID instantiation
-  vid_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: vid_ip_addr }}]
-
-  vid_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace: 
-          template: base-vid
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vid_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: vid_docker }
-            __gerrit_branch__: { get_param: vid_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vid_repo__: { get_param: vid_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__vid_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            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
-            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 }}]
-
-  sdnc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-sdnc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdnc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: sdnc_docker }
-            __gerrit_branch__: { get_param: sdnc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdnc_repo__: { get_param: sdnc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__sdnc_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__sdnc_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh
-            cd /opt
-            chmod +x sdnc_install.sh
-            ./sdnc_install.sh
-
-
-  # SDC instantiation
-  sdc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
-
-  sdc_volume_data:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-data
-      size: 100
-
-  sdc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace:
-          template: base-sdc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdc_private_port }
-      block_device_mapping:
-        - device_name: /dev/vdb
-          volume_id: { get_resource: sdc_volume_data }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __env_name__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __mr_ip_addr__: { get_param: mr_ip_addr }
-            __docker_version__: { get_param: sdc_docker }
-            __gerrit_branch__: { get_param: sdc_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __sdc_repo__: { get_param: sdc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__env_name__" > /opt/config/env_name.txt
-            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__sdc_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            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
-            cd /opt
-            chmod +x sdc_install.sh
-            ./sdc_install.sh
-
-
-  # PORTAL instantiation
-  portal_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: portal_ip_addr }}]
-
-  portal_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-portal
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: portal_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: portal_docker }
-            __gerrit_branch__: { get_param: portal_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __cli_docker__: { get_param: cli_docker }
-            __external_dns__: { get_param: external_dns }
-            __portal_repo__: { get_param: portal_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 "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__portal_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__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
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh
-            cd /opt
-            chmod +x portal_install.sh
-            ./portal_install.sh
-
-
-  # DCAE Controller instantiation
-#  dcae_c_private_port:
-#    type: OS::Neutron::Port
-#    properties:
-#      network: { get_resource: oam_onap }
-#      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
-
-#  dcae_c_vm:
-#    type: OS::Nova::Server
-#    properties:
-#      image: { get_param: ubuntu_1404_image }
-#      flavor: { get_param: flavor_medium }
-#      name:
-#        str_replace: 
-#          template: base-dcae-controller
-#          params:
-#            base: { get_param: vm_base_name }
-#      key_name: { get_resource: vm_key }
-#      networks:
-#        - network: { get_param: public_net_id }
-#        - port: { get_resource: dcae_c_private_port }
-#      user_data_format: RAW
-#      user_data:
-#        str_replace:
-#          params:
-#            __nexus_repo__: { get_param: nexus_repo }
-#            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-#            __nexus_username__: { get_param: nexus_username }
-#            __nexus_password__: { get_param: nexus_password }
-#            __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
-#            __gitlab_branch__: { get_param: gitlab_branch }
-#            __dns_ip_addr__: { get_param: dns_ip_addr }
-#            __oam_network_cidr__: { get_param: oam_network_cidr }
-#            __dcae_zone__: { get_param: dcae_zone }
-#            __dcae_state__: { get_param: dcae_state }
-#            __artifacts_version__: { get_param: artifacts_version }
-#            __tenant_id__: { get_param: openstack_tenant_id }
-#            __openstack_private_network_name__: { get_attr: [oam_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 }
-#            __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 "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-#            echo "__public_net_id__" > /opt/config/public_net_id.txt
-#            echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.txt
-#            echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt
-#            echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
-#            echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt
-#            echo "__dcae_db_ip_addr__" > /opt/config/dcae_db_ip_addr.txt
-#            echo "__dcae_hdp1_ip_addr__" > /opt/config/dcae_hdp1_ip_addr.txt
-#            echo "__dcae_hdp2_ip_addr__" > /opt/config/dcae_hdp2_ip_addr.txt
-#            echo "__dcae_hdp3_ip_addr__" > /opt/config/dcae_hdp3_ip_addr.txt
-#            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 }}]
-
-  policy_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_xlarge }
-      name:
-        str_replace: 
-          template: base-policy
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: policy_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __policy_ip_addr__: { get_param: policy_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: policy_docker }
-            __gerrit_branch__: { get_param: policy_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __policy_repo__: { get_param: policy_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__policy_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            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
-            cd /opt
-            chmod +x policy_install.sh
-            ./policy_install.sh
-
-
-  # APP-C instantiation
-  appc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: appc_ip_addr }}]
-
-  appc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1404_image }
-      flavor: { get_param: flavor_large }
-      name:
-        str_replace: 
-          template: base-appc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: appc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: appc_docker }
-            __gerrit_branch__: { get_param: appc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __appc_repo__: { get_param: appc_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__appc_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__appc_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh
-            cd /opt
-            chmod +x appc_install.sh
-            ./appc_install.sh
-
-
-  # CLAMP instantiation
-  clamp_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}]
-
-  clamp_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace:
-          template: base-clamp
-          params:
-            base: { get_param: vm_base_name }      
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: clamp_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __docker_version__: { get_param: clamp_docker }
-            __gerrit_branch__: { get_param: clamp_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __clamp_repo__: { get_param: clamp_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__clamp_ip_addr__" > /opt/config/local_ip_addr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_region__" > /opt/config/openstack_region.txt
-            echo "__keystone_url__" > /opt/config/keystone.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__clamp_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh
-            cd /opt
-            chmod +x clamp_install.sh
-            ./clamp_install.sh
-
-
-  # OPEN-O VM instantiation
-  openo_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}]
-
-  openo_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_xxlarge }
-      name:
-        str_replace:
-          template: base-openo-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: openo_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __oam_network_cidr__: { get_param: oam_network_cidr }
-            __aai1_ip_addr__: { get_param: aai1_ip_addr }
-            __aai2_ip_addr__: { get_param: aai2_ip_addr }
-            __appc_ip_addr__: { get_param: appc_ip_addr }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __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 }
-            __portal_ip_addr__: { get_param: portal_ip_addr }
-            __robot_ip_addr__: { get_param: robot_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
-            __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
-            __vid_ip_addr__: { get_param: vid_ip_addr }
-            __clamp_ip_addr__: { get_param: clamp_ip_addr }
-            __openo_ip_addr__: { get_param: openo_ip_addr }
-            __cloud_env__: { get_param: cloud_env }
-            __external_dns__: { get_param: external_dns }
-            __vnfsdk_branch__: { get_param: vnfsdk_branch }
-            __msb_docker__: { get_param: msb_docker }
-            __mvim_docker__: { get_param: mvim_docker }
-            __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
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt
-            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt
-            echo "__msb_docker__" > /opt/config/msb_docker.txt
-            echo "__mvim_docker__" > /opt/config/mvim_docker.txt
-            echo "__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
-            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
-            echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt
-            echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh
-            cd /opt
-            chmod +x openo_install.sh
-            ./openo_install.sh
-
-
-  # DCAE GEN 2 Controller instantiation
-  dcae_c_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
-
-  dcae_c_vm:
-    type: OS::Nova::Server
-    properties:
-      image: { get_param: ubuntu_1604_image }
-      flavor: { get_param: flavor_medium }
-      name:
-        str_replace: 
-          template: base-dcae-controller
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: dcae_vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dcae_c_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dns_ip_addr__: { get_param: dns_ip_addr }
-            __dcae_zone__: { get_param: dcae_zone }
-            __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 }
-            __key_name__: { get_param: dcae_key_name }
-            __pub_key__: { get_param: dcae_pub_key }
-            __private_key__: { get_attr: [ dcae_vm_key, private_key ] }
-            __openstack_region__: { get_param: openstack_region }
-            __keystone_url__: { get_param: keystone_url }
-            __docker_version__: { get_param: dcae_docker }
-            __dcae_repo__: { get_param: dcae_repo }
-            __gerrit_branch__: { get_param: dcae_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __public_net_id__: { get_param: public_net_id }
-            __dcae_ip_addr__: { get_param: dcae_ip_addr }
-            __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
-            __external_dns__: { get_param: external_dns }
-            __ubuntu_1604_image__: { get_param: ubuntu_1604_image }
-            __centos_7_image__: { get_param: centos_7_image }
-            __security_group__ : { get_param: security_group }
-            __flavor_medium__: { get_param: flavor_medium }
-            __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
-            __rand_str__: { get_resource: random-str }
-
-          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 "__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 "__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 "__key_name__" > /opt/config/key_name.txt
-            echo "__pub_key__" > /opt/config/pub_key.txt
-            echo "__private_key__" > /opt/config/priv_key
-            echo "__openstack_region__" > /opt/config/openstack_region.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_ip_addr__" > /opt/config/dcae_ip_addr.txt
-            echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
-            echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
-            echo "__centos_7_image__" > /opt/config/centos_7_image.txt
-            echo "__security_group__" > /opt/config/security_group.txt
-            echo "__flavor_medium__" > /opt/config/flavor_medium.txt
-            echo "__dcae_repo__" > /opt/config/remote_repo.txt
-            echo "__mac_addr__" > /opt/config/mac_addr.txt
-            echo "__rand_str__" > /opt/config/rand_str.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
-\ No newline at end of file
diff --git a/heat/ONAP/deprecated/onap_rackspace.env b/heat/ONAP/deprecated/onap_rackspace.env
deleted file mode 100644
index d08c24e8..00000000
--- a/heat/ONAP/deprecated/onap_rackspace.env
+++ /dev/null
@@ -1,106 +0,0 @@
-parameters:
-
-  # Generic parameters used across all ONAP components
-
-  public_net_id: 00000000-0000-0000-0000-000000000000
-
-  vm_base_name: vm1
-
-  key_name: onap_key
-
-  pub_key: INSERT YOUR PUBLIC KEY HERE
-
-  nexus_repo: https://nexus.onap.org/content/sites/raw
-
-  nexus_docker_repo: nexus3.onap.org:10001
-
-  nexus_username: docker
-
-  nexus_password: docker
-
-  openstack_tenant_id: INSERT YOUR USERNAME HERE
-
-  openstack_username: INSERT YOUR PASSWORD HERE
-
-  openstack_api_key: INSERT YOUR API KEY HERE
-
-  openstack_password: INSERT YOUR PASSWORD HERE
-
-  openstack_auth_method: api-key
-
-  dmaap_topic: AUTO
-
-  artifacts_version: 1.1.0-SNAPSHOT
-
-  cloud_env: rackspace
-
-
-  # Parameters for DCAE instantiation
-
-  dcae_base_environment: RACKSPACE
-
-  dcae_zone: iad4
-
-  dcae_state: vi
-
-  nexus_repo_root: https://nexus.onap.org
-
-  nexus_url_snapshot: https://nexus.onap.org/content/repositories/snapshots
-
-  openstack_region: IAD
-
-  gitlab_branch: master
-
-  dcae_code_version: 1.1.0
-
-
-  # IP Address of DCAE VMs
-  dcae_ip_addr: 10.0.4.1
-  dcae_coll_ip_addr: 10.0.4.102
-  dcae_db_ip_addr: 10.0.4.101
-  dcae_hdp1_ip_addr: 10.0.4.103
-  dcae_hdp2_ip_addr: 10.0.4.104
-  dcae_hdp3_ip_addr: 10.0.4.105
-
-  # ONAP repositories, docker versions, and Gerrit branches
-
-  aai_repo: http://gerrit.onap.org/r/aai/test-config
-  appc_repo: http://gerrit.onap.org/r/appc/deployment.git
-  dcae_repo: http://gerrit.onap.org/r/dcae/demo/startup/controller.git
-  mr_repo: http://gerrit.onap.org/r/dcae/demo/startup/message-router.git
-  so_repo: http://gerrit.onap.org/r/so/docker-config.git
-  policy_repo: http://gerrit.onap.org/r/policy/docker.git
-  portal_repo: http://gerrit.onap.org/r/portal.git
-  robot_repo: http://gerrit.onap.org/r/testsuite/properties.git
-  sdc_repo: http://gerrit.onap.org/r/sdc.git
-  sdnc_repo: http://gerrit.onap.org/r/sdnc/oam.git
-  vid_repo: http://gerrit.onap.org/r/vid.git
-  clamp_repo: http://gerrit.onap.org/r/clamp.git
-
-  aai_branch: master
-  appc_branch: master
-  so_branch: master
-  mr_branch: master
-  dcae_branch: master
-  policy_branch: master
-  portal_branch: release-1.3.0
-  robot_branch: master
-  sdc_branch: master
-  sdnc_branch: master
-  vid_branch: master
-  clamp_branch: master
-
-  aai_docker: 1.1-STAGING-latest
-  appc_docker: 1.1-STAGING-latest
-  so_docker: 1.1-STAGING-latest
-  mr_docker: 1.1-STAGING-latest
-  dcae_docker: 1.1-STAGING-latest
-  policy_docker: 1.1-STAGING-latest
-  portal_docker: v1.3.0
-  robot_docker: 1.1-STAGING-latest
-  sdc_docker: 1.1-STAGING-latest
-  sdnc_docker: 1.2-STAGING-latest
-  vid_docker: 1.1-STAGING-latest
-  clamp_docker: 1.1-STAGING-latest
-  dgbuilder_docker: 0.1-STAGING-latest
-  cli_docker: v1.1.0
diff --git a/heat/ONAP/deprecated/onap_rackspace.yaml b/heat/ONAP/deprecated/onap_rackspace.yaml
deleted file mode 100644
index a73053f2..00000000
--- a/heat/ONAP/deprecated/onap_rackspace.yaml
+++ /dev/null
@@ -1,1230 +0,0 @@
-##########################################################################
-#
-#==================LICENSE_START==========================================
-# 
-#
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#==================LICENSE_END============================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-##########################################################################
-
-heat_template_version: 2013-05-23
-
-description: Heat template to deploy ONAP components
-
-parameters:
-
-  # Generic parameters used across all ONAP components
-  public_net_id:
-    type: string
-    description: Public network that enables remote connection to the compute instance
-
-  key_name:
-    type: string
-    description: Public/Private key pair name
-
-  vm_base_name:
-    type: string
-    description: Base name of ONAP VMs
-
-  pub_key:
-    type: string
-    description: Public key or SSL certificate to be installed on the compute instance
-
-  nexus_repo:
-    type: string
-    description: Complete URL for the Nexus repository.
-
-  nexus_docker_repo:
-    type: string
-    description: Complete URL for the Nexus repository for docker images.
-
-  nexus_username:
-    type: string
-    description: Nexus Repository username
-
-  nexus_password:
-    type: string
-    description: Nexus Repository Password
-
-  openstack_tenant_id:
-    type: string
-    description: Rackspace tenant ID
-
-  openstack_username:
-    type: string
-    description: Rackspace username
-
-  openstack_api_key:
-    type: string
-    description: Rackspace API Key
-
-  openstack_password:
-    type: string
-    description: Rackspace Password
-
-  openstack_auth_method:
-    type: string
-    description: Openstack authentication method (password VS. api-key)
-
-  dmaap_topic:
-    type: string
-    description: DMaaP topic name
-
-  artifacts_version:
-    type: string
-    description: Artifacts version of ONAP components
-
-  cloud_env:
-    type: string
-    description: Cloud Provider Name
-
-
-  # Parameters for DCAE instantiation
-  dcae_base_environment:
-    type: string
-    description: DCAE Base Environment configuration (for this template, only RACKSPACE is supported)
-
-  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
-
-  openstack_region:
-    type: string
-    description: Rackspace region where the DCAE controller will spin the VMs
-
-  gitlab_branch:
-    type: string
-    description: Branch of the Gitlab repository
-
-  dcae_code_version:
-    type: string
-    description: DCAE Code Version Number
-
-  dcae_ip_addr:
-    type: string
-    description: DCAE IP Address
- 
-  dcae_coll_ip_addr:
-    type: string
-    description: DCAE Collector IP Address
-
-  dcae_db_ip_addr:
-    type: string
-    description: DCAE Database IP Address
-
-  dcae_hdp1_ip_addr:
-    type: string
-    description: Hadoop VM1 IP Address
-
-  dcae_hdp2_ip_addr:
-    type: string
-    description: Hadoop VM2 IP Address
-
-  dcae_hdp3_ip_addr:
-    type: string
-    description: Hadoop VM3 IP Address
-
-  # ONAP repositories, docker versions, and Gerrit branches
-  aai_repo:
-    type: string
-  appc_repo:
-    type: string
-  dcae_repo:
-    type: string
-  mr_repo:
-    type: string
-  so_repo:
-    type: string
-  policy_repo:
-    type: string
-  portal_repo:
-    type: string
-  robot_repo:
-    type: string
-  sdc_repo:
-    type: string
-  sdnc_repo:
-    type: string
-  vid_repo:
-    type: string
-  clamp_repo:
-    type: string
-
-  aai_docker:
-    type: string
-  appc_docker:
-    type: string
-  so_docker:
-    type: string
-  mr_docker:
-    type: string
-  dcae_docker:
-    type: string
-  policy_docker:
-    type: string
-  portal_docker:
-    type: string
-  robot_docker:
-    type: string
-  sdc_docker:
-    type: string
-  sdnc_docker:
-    type: string
-  vid_docker:
-    type: string
-  clamp_docker:
-    type: string
-  dgbuilder_docker:
-    type: string
-  cli_docker:
-    type: string
-
-  aai_branch:
-    type: string
-  appc_branch:
-    type: string
-  so_branch:
-    type: string
-  mr_branch:
-    type: string
-  dcae_branch:
-    type: string
-  policy_branch:
-    type: string
-  portal_branch:
-    type: string
-  robot_branch:
-    type: string
-  sdc_branch:
-    type: string
-  sdnc_branch:
-    type: string
-  vid_branch:
-    type: string
-  clamp_branch:
-    type: string
-
-
-resources:
-  random-str:
-    type: OS::Heat::RandomString
-    properties:
-      length: 4
-
-  # Public key used to access ONAP components
-  vm_key:
-    type: OS::Nova::KeyPair
-    properties:
-      name:
-        str_replace:
-          template: base_rand
-          params:
-            base: { get_param: key_name }
-            rand: { get_resource: random-str }
-      public_key: { get_param: pub_key }
-      save_private_key: false
-
-
-  # ONAP management private network
-  oam_onap:
-    type: OS::Neutron::Net
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-
-  oam_onap_subnet:
-    type: OS::Neutron::Subnet
-    properties:
-      name:
-        str_replace:
-          template: oam_onap_rand
-          params:
-            rand: { get_resource: random-str }
-      network_id: { get_resource: oam_onap }
-      cidr: 10.0.0.0/16
-
-
-  # DNS Server instantiation
-  dns_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.0.1}]
-
-  dns_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-dns-server
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dns_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __artifacts_version__: { get_param: artifacts_version }
-            __cloud_env__: { get_param: cloud_env }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
-            cd /opt
-            chmod +x dns_install.sh
-            ./dns_install.sh
-
-
-  # A&AI instantiation (2 VMs)
-  aai1_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.1.1}]
-
-  aai1_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-aai
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  aai1_vm:
-    type: OS::Nova::Server
-    depends_on: aai2_vm
-    properties:
-      flavor: 15 GB Compute v1
-      name:
-        str_replace:
-          template: base-aai-inst1
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: aai1_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: aai1_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __aai_repo__: { get_param: aai_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_1" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  aai2_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.1.2}]
-
-  aai2_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol2-aai
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  aai2_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Compute v1
-      name:
-        str_replace:
-          template: base-aai-inst2
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: aai2_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: aai2_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: aai_docker }
-            __gerrit_branch__: { get_param: aai_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __aai_repo__: { get_param: aai_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "aai_instance_2" > /opt/config/aai_instance.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
-
-
-  # SO instantiation
-  so_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.5.1}]
-
-  so_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-so
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: so_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: so_docker }
-            __gerrit_branch__: { get_param: so_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __so_repo__: { get_param: so_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            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
-            cd /opt
-            chmod +x so_install.sh
-            ./so_install.sh
-
-
-  # Message Router instantiation
-  mrouter_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.11.1}]
-
-  mrouter_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 15 GB I/O v1
-      name:
-        str_replace:
-          template: base-message-router
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: mrouter_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __gerrit_branch__: { get_param: mr_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__mr_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh
-            cd /opt
-            chmod +x mr_install.sh
-            ./mr_install.sh
-
-
-  # RobotE2E instantiation
-  robot_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.10.1}]
-
-  robot_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-      flavor: 2 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-robot
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: robot_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __network_name__: { get_attr: [oam_onap, name] }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_api_key__: { get_param : openstack_api_key }
-            __openstack_password__: { get_param: openstack_password }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __artifacts_version__: { get_param: artifacts_version }
-            __openstack_region__: { get_param: openstack_region }
-            __docker_version__: { get_param: robot_docker }
-            __gerrit_branch__: { get_param: robot_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __robot_repo__: { get_param: robot_repo }
-          template: |
-            #!/bin/bash
-
-            # Create configuration files
-            mkdir -p /opt/config
-            echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
-            echo "__nexus_repo__" > /opt/config/nexus_repo.txt
-            echo "__nexus_username__" > /opt/config/nexus_username.txt
-            echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__network_name__" > /opt/config/network.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_password__" > /opt/config/openstack_password.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt
-            echo "__openstack_region__" > /opt/config/region.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "https://identity.api.rackspacecloud.com/v2.0" > /opt/config/keystone.txt
-            echo "10.0.1.1" > /opt/config/aai1_ip_addr.txt
-            echo "10.0.1.2" > /opt/config/aai2_ip_addr.txt
-            echo "10.0.2.1" > /opt/config/appc_ip_addr.txt
-            echo "10.0.4.1" > /opt/config/dcae_ip_addr.txt
-            echo "10.0.5.1" > /opt/config/so_ip_addr.txt
-            echo "10.0.11.1" > /opt/config/mr_ip_addr.txt
-            echo "10.0.6.1" > /opt/config/policy_ip_addr.txt
-            echo "10.0.9.1" > /opt/config/portal_ip_addr.txt
-            echo "10.0.3.1" > /opt/config/sdc_ip_addr.txt
-            echo "10.0.7.1" > /opt/config/sdnc_ip_addr.txt
-            echo "10.0.8.1" > /opt/config/vid_ip_addr.txt
-            echo "10.0.12.1" > /opt/config/clamp_ip_addr.txt
-            echo "Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)" > /opt/config/vm_image_name.txt
-            echo "4 GB General Purpose v1" > /opt/config/vm_flavor.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__robot_repo__" > /opt/config/remote_repo.txt
-
-            # Download and run install script
-            curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh
-            cd /opt
-            chmod +x robot_install.sh
-            ./robot_install.sh
-
-
-  # VID instantiation
-  vid_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.8.1}]
-
-  vid_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 2 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-vid
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: vid_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: vid_docker }
-            __gerrit_branch__: { get_param: vid_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __vid_repo__: { get_param: vid_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            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": 10.0.7.1}]
-
-  sdnc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-sdnc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdnc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: sdnc_docker }
-            __gerrit_branch__: { get_param: sdnc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __sdnc_repo__: { get_param: sdnc_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x sdnc_install.sh
-            ./sdnc_install.sh
-
-
-  # SDC instantiation
-  sdc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.3.1}]
-
-  sdc_volume_local:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-local
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-
-  sdc_volume_data:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-sdc-data
-      size: 100
-      volume_type: SSD
-
-  sdc_volume_attachment:
-    type: OS::Cinder::VolumeAttachment
-    properties:
-      volume_id: { get_resource: sdc_volume_data }
-      instance_uuid: { get_resource: sdc_vm }
-      mountpoint: /dev/xvdb
-
-  sdc_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Compute v1
-      name:
-        str_replace:
-          template: base-sdc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: sdc_volume_local }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: sdc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __env_name__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: sdc_docker }
-            __gerrit_branch__: { get_param: sdc_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __sdc_repo__: { get_param: sdc_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 "__env_name__" > /opt/config/env_name.txt
-            echo "10.0.11.1" > /opt/config/mr_ip_addr.txt
-            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x sdc_install.sh
-            ./sdc_install.sh
-
-
-  # PORTAL instantiation
-  portal_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.9.1}]
-
-  portal_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-portal
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  portal_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Memory v1
-      name:
-        str_replace:
-          template: base-portal
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: portal_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: portal_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: portal_docker }
-            __gerrit_branch__: { get_param: portal_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __cli_docker__: { get_param: cli_docker }
-            __portal_repo__: { get_param: portal_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /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 "__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
-            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": 10.0.4.1}]
-  dcae_c_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 8 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-dcae-controller
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: dcae_c_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __nexus_url_snapshots__: { get_param: nexus_url_snapshot }
-            __gitlab_branch__: { get_param: gitlab_branch }
-            __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 }
-            __docker_version__: { get_param: dcae_docker }
-            __gerrit_branch__: { get_param: dcae_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __dcae_code_version__: { get_param: dcae_code_version }
-            __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_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 "10.0.0.1" > /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 "https://mycloud.rackspace.com/cloud" > /opt/config/horizon_url.txt
-            echo "https://identity.api.rackspacecloud.com" > /opt/config/keystone_url.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__dcae_code_version__" > /opt/config/dcae_code_version.txt
-            echo "__public_net_id__" > /opt/config/public_net_id.txt
-            echo "__dcae_base_environment__" > /opt/config/dcae_base_environment.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_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": 10.0.6.1}]
-
-  policy_volume:
-    type: OS::Cinder::Volume
-    properties:
-      name: vol1-policy
-      size: 50
-      volume_type: SSD
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-
-  policy_vm:
-    type: OS::Nova::Server
-    properties:
-      flavor: 15 GB Compute v1
-      name:
-        str_replace:
-          template: base-policy
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      block_device_mapping:
-        - volume_id: { get_resource: policy_volume }
-          device_name: vda
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: policy_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: policy_docker }
-            __gerrit_branch__: { get_param: policy_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __policy_repo__: { get_param: policy_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x policy_install.sh
-            ./policy_install.sh
-
-
-  # APP-C instantiation
-  appc_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.2.1}]
-
-  appc_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-appc
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: appc_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: appc_docker }
-            __gerrit_branch__: { get_param: appc_branch }
-            __dgbuilder_docker__: { get_param: dgbuilder_docker }
-            __cloud_env__: { get_param: cloud_env }
-            __appc_repo__: { get_param: appc_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            echo "__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
-            cd /opt
-            chmod +x appc_install.sh
-            ./appc_install.sh
-
-
-  # CLAMP instantiation
-  clamp_private_port:
-    type: OS::Neutron::Port
-    properties:
-      network: { get_resource: oam_onap }
-      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.12.1}]
-
-  clamp_vm:
-    type: OS::Nova::Server
-    properties:
-      image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM)
-      flavor: 4 GB General Purpose v1
-      name:
-        str_replace:
-          template: base-clamp
-          params:
-            base: { get_param: vm_base_name }
-      key_name: { get_resource: vm_key }
-      networks:
-        - network: { get_param: public_net_id }
-        - port: { get_resource: clamp_private_port }
-      user_data_format: RAW
-      user_data:
-        str_replace:
-          params:
-            __nexus_repo__: { get_param: nexus_repo }
-            __nexus_docker_repo__: { get_param: nexus_docker_repo }
-            __nexus_username__: { get_param: nexus_username }
-            __nexus_password__: { get_param: nexus_password }
-            __openstack_username__: { get_param: openstack_username }
-            __openstack_tenant_id__: { get_param: openstack_tenant_id }
-            __openstack_api_key__: { get_param: openstack_api_key }
-            __dmaap_topic__: { get_param: dmaap_topic }
-            __artifacts_version__: { get_param: artifacts_version }
-            __docker_version__: { get_param: clamp_docker }
-            __gerrit_branch__: { get_param: clamp_branch }
-            __cloud_env__: { get_param: cloud_env }
-            __clamp_repo__: { get_param: clamp_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 "__artifacts_version__" > /opt/config/artifacts_version.txt
-            echo "10.0.0.1" > /opt/config/dns_ip_addr.txt
-            echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
-            echo "__openstack_username__" > /opt/config/openstack_username.txt
-            echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
-            echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt
-            echo "__docker_version__" > /opt/config/docker_version.txt
-            echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
-            echo "__cloud_env__" > /opt/config/cloud_env.txt
-            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
-            cd /opt
-            chmod +x clamp_install.sh
-            ./clamp_install.sh
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 94958c5b..72cf6e4a 100644
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -36,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.1
+  artifacts_version: 1.3.0-SNAPSHOT
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
diff --git a/heat/ONAP/onap_openstack_template.env b/heat/ONAP/onap_openstack_template.env
index 98aedd90..7788ac8c 100644
--- a/heat/ONAP/onap_openstack_template.env
+++ b/heat/ONAP/onap_openstack_template.env
@@ -36,7 +36,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.2.1
+  artifacts_version: 1.3.0-SNAPSHOT
 
   openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE
 
diff --git a/heat/vCPE/infra/base_vcpe_infra.env b/heat/vCPE/infra/base_vcpe_infra.env
index dafe72f1..64fc0930 100644
--- a/heat/vCPE/infra/base_vcpe_infra.env
+++ b/heat/vCPE/infra/base_vcpe_infra.env
@@ -31,7 +31,7 @@ parameters:
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vaaa_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vCPE/vbng/base_vcpe_vbng.env b/heat/vCPE/vbng/base_vcpe_vbng.env
index 0495cf0e..c702178b 100644
--- a/heat/vCPE/vbng/base_vcpe_vbng.env
+++ b/heat/vCPE/vbng/base_vcpe_vbng.env
@@ -26,7 +26,7 @@
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vbng_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
index 272f23c2..a08a84f6 100644
--- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
+++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu.env
@@ -16,7 +16,7 @@
   vf_module_id: vCPE_Customer_BRGEMU
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vbrgemu_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux.env b/heat/vCPE/vgmux/base_vcpe_vgmux.env
index 9e557ada..663408e8 100644
--- a/heat/vCPE/vgmux/base_vcpe_vgmux.env
+++ b/heat/vCPE/vgmux/base_vcpe_vgmux.env
@@ -23,7 +23,7 @@
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vgmux_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vCPE/vgw/base_vcpe_vgw.env b/heat/vCPE/vgw/base_vcpe_vgw.env
index c6e20541..65468124 100644
--- a/heat/vCPE/vgw/base_vcpe_vgw.env
+++ b/heat/vCPE/vgw/base_vcpe_vgw.env
@@ -23,7 +23,7 @@
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vgw_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vFW/base_vfw.env b/heat/vFW/base_vfw.env
index 7f031f63..86f3e383 100644
--- a/heat/vFW/base_vfw.env
+++ b/heat/vFW/base_vfw.env
@@ -25,7 +25,7 @@ parameters:
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vFWCL/vFWSNK/base_vfw.env b/heat/vFWCL/vFWSNK/base_vfw.env
index a6c4c738..887987ae 100644
--- a/heat/vFWCL/vFWSNK/base_vfw.env
+++ b/heat/vFWCL/vFWSNK/base_vfw.env
@@ -25,7 +25,7 @@ parameters:
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: PUT YOUR KEY HERE
diff --git a/heat/vFWCL/vPKG/base_vpkg.env b/heat/vFWCL/vPKG/base_vpkg.env
index 317fde9e..be1515d9 100644
--- a/heat/vFWCL/vPKG/base_vpkg.env
+++ b/heat/vFWCL/vPKG/base_vpkg.env
@@ -18,7 +18,7 @@ parameters:
   vf_module_id: vTrafficPNG
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vfw_key
   pub_key: PUT YOUR PUBLIC KEY HERE
diff --git a/heat/vLB/base_vlb.env b/heat/vLB/base_vlb.env
index 78cc994d..aa21eccc 100644
--- a/heat/vLB/base_vlb.env
+++ b/heat/vLB/base_vlb.env
@@ -28,7 +28,7 @@ parameters:
   dcae_collector_port: 8081
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vlb_key
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
diff --git a/heat/vLB/dnsscaling.env b/heat/vLB/dnsscaling.env
index 2196337b..ad61f22e 100644
--- a/heat/vLB/dnsscaling.env
+++ b/heat/vLB/dnsscaling.env
@@ -16,7 +16,7 @@ parameters:
   vf_module_id: vLoadBalancer
   repo_url_blob: https://nexus.onap.org/content/sites/raw
   repo_url_artifacts: https://nexus.onap.org/content/repositories/releases
-  demo_artifacts_version: 1.2.1
+  demo_artifacts_version: 1.3.0-SNAPSHOT
   install_script_version: 1.2.1
   key_name: vlb_key_scaling
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDQXYJYYi3/OUZXUiCYWdtc7K0m5C0dJKVxPG0eI8EWZrEHYdfYe6WoTSDJCww+1qlBSpA5ac/Ba4Wn9vh+lR1vtUKkyIC/nrYb90ReUd385Glkgzrfh5HdR5y5S2cL/Frh86lAn9r6b3iWTJD8wBwXFyoe1S2nMTOIuG4RPNvfmyCTYVh8XTCCE8HPvh3xv2r4egawG1P4Q4UDwk+hDBXThY2KS8M5/8EMyxHV0ImpLbpYCTBA6KYDIRtqmgS6iKyy8v2D1aSY5mc9J0T5t9S2Gv+VZQNWQDDKNFnxqYaAo1uEoq/i1q63XC5AD3ckXb2VT6dp23BQMdDfbHyUWfJN
author	Gary Wu <gary.i.wu@huawei.com>	2018-06-26 08:08:55 -0700
committer	Gary Wu <gary.i.wu@huawei.com>	2018-06-26 08:12:06 -0700
commit	fd761391ba59ba11452270807033e3605da5c6a4 (patch)
tree	3502ba0434c1fefa22ba7839c66c9a799dba3726
parent	2d4018ebc025bdbc072f9d01ddd4b1fda9a39c30 (diff)