Change DACE by DCAE
[demo.git] / heat / ONAP / onap_openstack.yaml
index c0e8c8f..7aba53e 100644 (file)
@@ -3,7 +3,7 @@
 #==================LICENSE_START==========================================
 # 
 #
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -52,10 +52,6 @@ parameters:
     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
@@ -76,10 +72,6 @@ parameters:
     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
@@ -88,18 +80,10 @@ parameters:
     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.
@@ -152,6 +136,10 @@ parameters:
     type: string
     description: Cloud Provider Name
 
+  openstack_region:
+    type: string
+    description: Region where the DCAE controller will spin the VMs
+
   ######################
   #                    #
   # Network parameters #
@@ -211,16 +199,16 @@ parameters:
     type: string
   openo_ip_addr:
     type: string
-  dcae_coll_float_ip:
-    type: string
-  dcae_db_float_ip:
-    type: string
-  dcae_hdp1_float_ip:
-    type: string
-  dcae_hdp2_float_ip:
-    type: string
-  dcae_hdp3_float_ip:
-    type: string
+#  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
 
   ###########################
   #                         #
@@ -228,37 +216,93 @@ parameters:
   #                         #
   ###########################
 
-  dcae_base_environment:
+  dcaeos_cloud_env:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
+    description: the cloud flavor of the OpenStack instance where DCAE is deployed
 
-  dcae_zone:
+  dcaeos_keystone_url:
     type: string
-    description: DCAE Zone to use in VM names created by DCAE controller
+    description: the keystone URL of the OpenStack instance where DCAE is deployed
 
-  dcae_state:
+  dcaeos_openstack_region:
     type: string
-    description: DCAE State to use in VM names created by DCAE controller
+    description: the region of the OpenStack instance where DCAE is deployed
 
-  nexus_repo_root:
+  dcaeos_openstack_tenant_id:
     type: string
-    description: Root URL of Nexus repository
+    description: the keystone URL of the OpenStack instance where DCAE is deployed
 
-  nexus_url_snapshot:
+  dcaeos_openstack_username:
     type: string
-    description: Snapshot of Maven repository for DCAE deployment
+    description: the username of the identity API of the OpenStack instance where DCAE is deployed
 
-  openstack_region:
+  dcaeos_openstack_password:
     type: string
-    description: Region where the DCAE controller will spin the VMs
+    description: the password of the identity API of the OpenStack instance where DCAE is deployed
+
+  dcaeos_dcae_key_name:
+    type: string
+    description: the key-pair name uploaded to the OpenStack instance where DCAE is deployed
 
-  gitlab_branch:
+  dcaeos_dcae_pub_key:
     type: string
-    description: Branch of the Gitlab repository
-    
-  dcae_code_version:
+    description: the public key of the key-pair uploaded to the OpenStack instance where DCAE is deployed
+
+  dcaeos_private_key:
     type: string
-    description: DCAE Code Version Number
+    description: the private key of the key-pair uploaded to the OpenStack instance where DCAE is deployed
+
+  dcaeos_openstack_private_network_name:
+    type: string
+    description: the name/id of the network used as DCAE internal network in the OpenStack instance where DCAE is deployed
+
+  dcaeos_public_net_id:
+    type: string
+    description: the name/id of the network where DCAE gets floating IPs from in the OpenStack instance where DCAE is deployed
+
+  dcaeos_ubuntu_1604_image:
+    type: string
+    description: the name/id of the Ubuntu1604 VM image in the OpenStack instance where DCAE is deployed
+
+  dcaeos_centos_7_image:
+    type: string
+    description: the name/id of the CentOS7 VM image in the OpenStack instance where DCAE is deployed
+
+  dcaeos_security_group:
+    type: string
+    description: the name/id of the security group to be used by DCAE VMs in the OpenStack instance where DCAE is deployed
+
+  dcaeos_flavor_id:
+    type: string
+    description: the name/id of the VM flavor to be used by DCAE VMs in the OpenStack instance where DCAE is deployed
+
+#  dcae_base_environment:
+#    type: string
+#    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS)
+
+  dcae_zone:
+    type: string
+    description: DCAE Zone to use in VM names created by DCAE controller
+
+#  dcae_state:
+#    type: string
+#    description: DCAE State to use in VM names created by DCAE controller
+
+#  nexus_repo_root:
+#    type: string
+#    description: Root URL of Nexus repository
+
+#  nexus_url_snapshot:
+#    type: string
+#    description: Snapshot of Maven repository for DCAE deployment
+
+#  gitlab_branch:
+#    type: string
+#    description: Branch of the Gitlab repository
+
+#  dcae_code_version:
+#    type: string
+#    description: DCAE Code Version Number
 
   #####################
   #                   #
@@ -331,8 +375,12 @@ parameters:
     type: string
   uui_docker:
     type: string
+  esr_docker:
+    type: string
   dgbuilder_docker:
     type: string
+  cli_docker:
+    type: string
 
   aai_branch:
     type: string
@@ -388,19 +436,6 @@ resources:
       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
@@ -699,6 +734,7 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
+            __openo_ip__: { get_param: openo_ip_addr }
             __docker_version__: { get_param: so_docker }
             __gerrit_branch__: { get_param: so_branch }
             __cloud_env__: { get_param: cloud_env }
@@ -715,6 +751,7 @@ resources:
             echo "__nexus_password__" > /opt/config/nexus_password.txt
             echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
+            echo "__openo_ip__" > /opt/config/openo_ip.txt
             echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt
             echo "__openstack_username__" > /opt/config/openstack_username.txt
             echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt
@@ -858,6 +895,8 @@ resources:
             __external_dns__: { get_param: external_dns }
             __vm_image_name__: { get_param: ubuntu_1404_image }
             __vm_flavor__: { get_param: flavor_medium }
+            __public_net_id__: { get_param: public_net_id }
+            __script_version__: { get_param: artifacts_version }
             __robot_repo__: { get_param: robot_repo }
           template: |
             #!/bin/bash
@@ -895,6 +934,8 @@ resources:
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__vm_image_name__" > /opt/config/vm_image_name.txt
             echo "__vm_flavor__" > /opt/config/vm_flavor.txt
+            echo "__script_version__" > /opt/config/script_version.txt
+            echo "__public_net_id__" > /opt/config/public_net_id.txt
             echo "__robot_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
@@ -1155,6 +1196,7 @@ resources:
             __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] }
             __docker_version__: { get_param: portal_docker }
             __gerrit_branch__: { get_param: portal_branch }
+            __cli_docker__: { get_param: cli_docker }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
             __portal_repo__: { get_param: portal_repo }
@@ -1172,6 +1214,7 @@ resources:
             echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__docker_version__" > /opt/config/docker_version.txt
             echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt
+            echo "__cli_docker__" > /opt/config/cli_docker_version.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
             echo "__portal_repo__" > /opt/config/remote_repo.txt
@@ -1557,7 +1600,7 @@ resources:
       flavor: { get_param: flavor_xxlarge }
       name:
         str_replace:
-          template: base-openo-server
+          template: base-multi-service
           params:
             base: { get_param: vm_base_name }
       key_name: { get_resource: vm_key }
@@ -1596,6 +1639,7 @@ resources:
             __mvim_docker__: { get_param: mvim_docker }
             __vfc_docker__: { get_param: vfc_docker }
             __uui_docker__: { get_param: uui_docker }
+            __esr_docker__: { get_param: esr_docker }
             __vnfsdk_repo__: { get_param: vnfsdk_repo }
           template: |
             #!/bin/bash
@@ -1616,6 +1660,7 @@ resources:
             echo "__mvim_docker__" > /opt/config/mvim_docker.txt
             echo "__vfc_docker__" > /opt/config/vfc_docker.txt
             echo "__uui_docker__" > /opt/config/uui_docker.txt
+            echo "__esr_docker__" > /opt/config/esr_docker.txt
             echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt
 
             # Create env file with the IP address of all ONAP components
@@ -1661,86 +1706,133 @@ resources:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_medium }
       name:
-        str_replace: 
-          template: base-dcae-controller
+        str_replace:
+          template: base-dcae-bootstrap
           params:
             base: { get_param: vm_base_name }
-      key_name: { get_resource: dcae_vm_key }
+      key_name: { get_resource: vm_key }
       networks:
         - port: { get_resource: dcae_c_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
           params:
+            __dcae_zone__: { get_param: dcae_zone }
+            __rand_str__: { get_resource: random-str }
+            # repo related
+            __artifacts_version__: { get_param: artifacts_version }
+            __docker_version__: { get_param: dcae_docker }
             __nexus_repo__: { get_param: nexus_repo }
             __nexus_docker_repo__: { get_param: nexus_docker_repo }
             __nexus_username__: { get_param: nexus_username }
             __nexus_password__: { get_param: nexus_password }
-            __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 }
+            # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            __mac_addr__: { get_attr: [dcae_c_private_port, mac_address] }
             __dcae_ip_addr__: { get_param: dcae_ip_addr }
             __dcae_float_ip__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
+            __dns_ip_addr__: { get_param: dns_ip_addr }
             __external_dns__: { get_param: external_dns }
-            __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 }
+            # conf for the OpensStack env where DCAE is deployed
+            __dcaeos_cloud_env__: { get_param: dcaeos_cloud_env }
+            __dcaeos_keystone_url__: { get_param: dcaeos_keystone_url }
+            __dcaeos_openstack_region__: { get_param: dcaeos_openstack_region }
+            __dcaeos_tenant_id__: { get_param: dcaeos_openstack_tenant_id }
+            __dcaeos_openstack_user__: { get_param: dcaeos_openstack_username }
+            __dcaeos_openstack_password__: { get_param: dcaeos_openstack_password }
+            __dcaeos_key_name__: { get_param: dcaeos_dcae_key_name }
+            __dcaeos_pub_key__: { get_param: dcaeos_dcae_pub_key }
+            __dcaeos_private_key__: { get_param: dcaeos_private_key }
+            __dcaeos_openstack_private_network_name__: { get_param: dcaeos_openstack_private_network_name }
+            __dcaeos_public_net_id__: { get_param: dcaeos_public_net_id }
+            __dcaeos_ubuntu_1604_image__: { get_param: dcaeos_ubuntu_1604_image }
+            __dcaeos_centos_7_image__: { get_param: dcaeos_centos_7_image }
+            __dcaeos_security_group__ : { get_param: dcaeos_security_group }
+            __dcaeos_flavor_id__: { get_param: dcaeos_flavor_id }
+            # fixed private IPs
+            __mr_ip_addr__: { get_param: mr_ip_addr }
+            __policy_ip_addr__: { get_param: policy_ip_addr }
+            __sdc_ip_addr__: { get_param: sdc_ip_addr }
+            # floating IPs
+            __dns_floating_ip_addr__: { get_attr: [dns_floating_ip, floating_ip_address] }
+            __aai1_floating_ip_addr__: { get_attr: [aai1_floating_ip, floating_ip_address] }
+            __aai2_floating_ip_addr__: { get_attr: [aai2_floating_ip, floating_ip_address] }
+            __so_floating_ip_addr__: { get_attr: [so_floating_ip, floating_ip_address] }
+            __mrouter_floating_ip_addr__: { get_attr: [mrouter_floating_ip, floating_ip_address] }
+            __robot_floating_ip_addr__: { get_attr: [robot_floating_ip, floating_ip_address] }
+            __vid_floating_ip_addr__: { get_attr: [vid_floating_ip, floating_ip_address] }
+            __sdnc_floating_ip_addr__: { get_attr: [sdnc_floating_ip, floating_ip_address] }
+            __sdc_floating_ip_addr__: { get_attr: [sdc_floating_ip, floating_ip_address] }
+            __portal_floating_ip_addr__: { get_attr: [portal_floating_ip, floating_ip_address] }
+            __policy_floating_ip_addr__: { get_attr: [policy_floating_ip, floating_ip_address] }
+            __appc_floating_ip_addr__: { get_attr: [appc_floating_ip, floating_ip_address] }
+            __clamp_floating_ip_addr__: { get_attr: [clamp_floating_ip, floating_ip_address] }
+            __openo_floating_ip_addr__: { get_attr: [openo_floating_ip, floating_ip_address] }
+            __dcae_c_floating_ip_addr__: { get_attr: [dcae_c_floating_ip, floating_ip_address] }
 
           template: |
             #!/bin/bash
 
             # Create configuration files
             mkdir -p /opt/config
+            echo "__rand_str__" > /opt/config/dcae_zone.txt
+            echo "__rand_str__" > /opt/config/rand_str.txt
+            # repo related
+            echo "__docker_version__" > /opt/config/docker_version.txt
+            echo "__artifacts_version__" > /opt/config/artifacts_version.txt
             echo "__nexus_repo__" > /opt/config/nexus_repo.txt
             echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt
             echo "__nexus_username__" > /opt/config/nexus_username.txt
             echo "__nexus_password__" > /opt/config/nexus_password.txt
-            echo "__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 "__dcae_repo__" > /opt/config/remote_repo.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
+            # conf for the ONAP environment where the DCAE bootstrap vm/conatiner runs
+            echo "__mac_addr__" > /opt/config/mac_addr.txt
             echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt
             echo "__dcae_float_ip__" > /opt/config/dcae_float_ip.txt
+            echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
-            echo "__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
+            # conf for the OpensStack env where DCAE is deployed
+            echo "__dcaeos_cloud_env__" > /opt/config/cloud_env.txt
+            echo "__dcaeos_keystone_url__" > /opt/config/keystone_url.txt
+            echo "__dcaeos_openstack_region__" > /opt/config/openstack_region.txt
+            echo "__dcaeos_tenant_id__" > /opt/config/tenant_id.txt
+            echo "__dcaeos_tenant_id__" > /opt/config/tenant_name.txt
+            echo "__dcaeos_openstack_user__" > /opt/config/openstack_user.txt
+            echo "__dcaeos_openstack_password__" > /opt/config/openstack_password.txt
+            echo "__dcaeos_key_name__" > /opt/config/key_name.txt
+            echo "__dcaeos_pub_key__" > /opt/config/pub_key.txt
+            echo "__dcaeos_private_key__" > /opt/config/priv_key
+            echo "__dcaeos_openstack_private_network_name__" > /opt/config/openstack_private_network_name.txt
+            echo "__dcaeos_public_net_id__" > /opt/config/public_net_id.txt
+            echo "__dcaeos_ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt
+            echo "__dcaeos_centos_7_image__" > /opt/config/centos_7_image.txt
+            echo "__dcaeos_security_group__" > /opt/config/security_group.txt
+            echo "__dcaeos_flavor_id__" > /opt/config/flavor_id.txt
+            # fixed private IP addresses of other ONAP components
+            echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt
+            echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt
+            echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt
+            # floating IPs
+            echo "__dns_floating_ip_addr__" > /opt/config/dns_floating_ip_addr.txt
+            echo "__aai1_floating_ip_addr__" > /opt/config/aai1_floating_ip_addr.txt
+            echo "__aai2_floating_ip_addr__" > /opt/config/aai2_floating_ip_addr.txt
+            echo "__so_floating_ip_addr__" > /opt/config/so_floating_ip_addr.txt
+            echo "__mrouter_floating_ip_addr__" > /opt/config/mrouter_floating_ip_addr.txt
+            echo "__robot_floating_ip_addr__" > /opt/config/robot_floating_ip_addr.txt
+            echo "__vid_floating_ip_addr__" > /opt/config/vid_floating_ip_addr.txt
+            echo "__sdnc_floating_ip_addr__" > /opt/config/sdnc_floating_ip_addr.txt
+            echo "__sdc_floating_ip_addr__" > /opt/config/sdc_floating_ip_addr.txt
+            echo "__portal_floating_ip_addr__" > /opt/config/portal_floating_ip_addr.txt
+            echo "__policy_floating_ip_addr__" > /opt/config/policy_floating_ip_addr.txt
+            echo "__appc_floating_ip_addr__" > /opt/config/appc_floating_ip_addr.txt
+            echo "__clamp_floating_ip_addr__" > /opt/config/clamp_floating_ip_addr.txt
+            echo "__openo_floating_ip_addr__" > /opt/config/opoeno_floating_ip_addr.txt
+            echo "__dcae_c_floating_ip_addr__" > /opt/config/dcae_c_floating_ip_addr.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/dcae2_install.sh -o /opt/dcae2_install.sh
             cd /opt
             chmod +x dcae2_install.sh
-            ./dcae2_install.sh
\ No newline at end of file
+            ./dcae2_install.sh