avoid hardcoded values

[demo.git] / heat / OpenECOMP / onap_openstack_float.yaml

diff --git a/heat/OpenECOMP/onap_openstack_float.yaml b/heat/OpenECOMP/onap_openstack_float.yaml
index 5623e49..2ba2322 100644 (file)
--- a/heat/OpenECOMP/onap_openstack_float.yaml
+++ b/heat/OpenECOMP/onap_openstack_float.yaml
@@ -39,11 +39,19 @@ 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 network subnet id
+
+  router_gateway_ip:
+    type: string
+    description: Public network gateway IP address
+
   ubuntu_1404_image:
     type: string
     description: Name of the Ubuntu 14.04 image
@@ -156,9 +164,13 @@ parameters:
     description: First element of the dns_list for ONAP network
 
   ### Floating IP addresses ###
-  aai_float_ip:
+  aai1_float_ip:
+    type: string
+    description: AAI Instance 1 Floating IP Address
+
+  aai2_float_ip:
     type: string
-    description: AAI Floating IP Address
+    description: AAI Instance 2 Floating IP Address
 
   appc_float_ip:
     type: string
@@ -229,9 +241,13 @@ parameters:
     type: string
     description: CIDR of the OAM ONAP network
 
-  aai_ip_addr:
+  aai1_ip_addr:
     type: string
-    description: AAI IP Address
+    description: AAI Instance 1 IP Address
+
+  aai2_ip_addr:
+    type: string
+    description: AAI Instance 2 IP Address
 
   appc_ip_addr:
     type: string
@@ -391,6 +407,9 @@ resources:
     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
@@ -418,7 +437,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace:
           template: base-dns-server
           params:
@@ -434,7 +453,8 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __oam_network_cidr__: { get_attr: [oam_ecomp_subnet, cidr] }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __aai_ip_addr__: { get_param: aai_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 }
@@ -447,7 +467,7 @@ resources:
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __cloud_env__: { get_param: cloud_env }
-
+            __external_dns__: { get_param: external_dns }
           template: |
             #!/bin/bash
 
@@ -458,7 +478,8 @@ resources:
             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 "__aai_ip_addr__" > /opt/config/aai_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
@@ -470,6 +491,7 @@ resources:
             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 "__external_dns__" > /opt/config/external_dns.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh
@@ -478,33 +500,34 @@ resources:
             ./dns_install.sh
 
 
-  # A&AI instantiation
-  aai_private_port:
+  # A&AI instantiation (2 VMs)
+  aai1_private_port:
     type: OS::Neutron::Port
     properties:
       network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai_ip_addr }}]
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai1_ip_addr }}]
 
-  aai_floating_ip:
+  aai1_floating_ip:
     type: OS::Neutron::FloatingIP
     properties:
       floating_network_id: { get_param: public_net_id }
-      port_id: { get_resource: aai_private_port }
-      floating_ip_address: { get_param: aai_float_ip }
+      port_id: { get_resource: aai1_private_port }
+      floating_ip_address: { get_param: aai1_float_ip }
 
-  aai_vm:
+  aai1_vm:
     type: OS::Nova::Server
+    depends_on: aai2_vm
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace:
-          template: base-aai
+          template: base-aai-inst1
           params:
             base: { get_param: vm_base_name }      
       key_name: { get_resource: vm_key }
       networks:
-        - port: { get_resource: aai_private_port }
+        - port: { get_resource: aai1_private_port }
       user_data_format: RAW
       user_data:
         str_replace:
@@ -516,9 +539,75 @@ resources:
             __dmaap_topic__: { get_param: dmaap_topic }
             __artifacts_version__: { get_param: artifacts_version }
             __dns_ip_addr__: { get_param: dns_ip_addr }
-            __sdc_ip_addr__: { get_param: sdc_ip_addr }
             __docker_version__: { get_param: docker_version }
             __cloud_env__: { get_param: cloud_env }
+            __gerrit_branch__: { get_param: gerrit_branch }
+            __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 "__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
+
+            # Download and run install script
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
+            cd /opt
+            chmod +x aai2_install.sh
+            ./aai2_install.sh
+
+
+  aai2_private_port:
+    type: OS::Neutron::Port
+    properties:
+      network: { get_resource: oam_ecomp }
+      fixed_ips: [{"subnet": { get_resource: oam_ecomp_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: docker_version }
+            __cloud_env__: { get_param: cloud_env }
+            __gerrit_branch__: { get_param: gerrit_branch }
             __external_dns__: { get_param: external_dns }
           template: |
             #!/bin/bash
@@ -531,17 +620,18 @@ 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 "__sdc_ip_addr__" > /opt/config/sdc_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
 
             # Download and run install script
-            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh
+            curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh
             cd /opt
-            chmod +x aai_install.sh
-            ./aai_install.sh
+            chmod +x aai2_install.sh
+            ./aai2_install.sh
 
 
   # MSO instantiation
@@ -563,7 +653,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace:
           template: base-mso
           params:
@@ -639,7 +729,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-message-router
           params:
@@ -701,7 +791,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_small }
-      name: 
+      name:
         str_replace: 
           template: base-robot
           params:
@@ -725,6 +815,18 @@ resources:
             __dns_ip_addr__: { get_param: dns_ip_addr }
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_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 }
+            __mso_ip_addr__: { get_param: mso_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 }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
           template: |
@@ -744,6 +846,18 @@ resources:
             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 "__mso_ip_addr__" > /opt/config/mso_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 "__cloud_env__" > /opt/config/cloud_env.txt
             echo "__external_dns__" > /opt/config/external_dns.txt
 
@@ -773,7 +887,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-vid
           params:
@@ -837,7 +951,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-sdnc
           params:
@@ -907,7 +1021,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1604_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-sdc
           params:
@@ -980,7 +1094,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-portal
           params:
@@ -1046,7 +1160,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_medium }
-      name: 
+      name:
         str_replace: 
           template: base-dcae-controller
           params:
@@ -1184,7 +1298,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_xlarge }
-      name: 
+      name:
         str_replace: 
           template: base-policy
           params:
@@ -1250,7 +1364,7 @@ resources:
     properties:
       image: { get_param: ubuntu_1404_image }
       flavor: { get_param: flavor_large }
-      name: 
+      name:
         str_replace: 
           template: base-appc
           params: