Parametrize ONAP installation repositories

- Remove hardcoded repository names from installation scripts
- Add parameters in Heat template
- Use those parameters in the install scripts

Change-Id: I3feadda7da22c282bd00618903de9aac1c01055b
Issue-ID: UCA-33
Signed-off-by: Marco Platania <platania@research.att.com>

1 files changed, 113 insertions, 37 deletions

diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml
index c3409de5..fad4c4bf 100644
--- a/heat/ONAP/onap_openstack.yaml
+++ b/heat/ONAP/onap_openstack.yaml
@@ -290,6 +290,56 @@ parameters:
     type: string
     description: DCAE Code Version Number
 
+  #####################
+  #                   #
+  # ONAP repositories #
+  #                   #
+  #####################
+
+  aai_repo:
+    type: string
+    description: AAI repository
+
+  appc_repo:
+    type: string
+    description: APPC repository
+
+  dcae_repo:
+    type: string
+    description: DCAE repository
+
+  mr_repo:
+    type: string
+    description: Message Router repository
+
+  mso_repo:
+    type: string
+    description: MSO repository
+
+  policy_repo:
+    type: string
+    description: Policy repository
+
+  portal_repo:
+    type: string
+    description: Portal repository
+
+  robot_repo:
+    type: string
+    description: Robot repository
+
+  sdc_repo:
+    type: string
+    description: SDC repository
+
+  sdnc_repo:
+    type: string
+    description: SDNC repository
+
+  vid_repo:
+    type: string
+    description: VID repository
+
 
 #############
 #           #
@@ -319,24 +369,24 @@ resources:
 
 
   # ONAP management private network
-  oam_ecomp:
+  oam_onap:
     type: OS::Neutron::Net
     properties:
       name:
         str_replace:
-          template: oam_ecomp_rand
+          template: oam_onap_rand
           params:
             rand: { get_resource: random-str }
 
-  oam_ecomp_subnet:
+  oam_onap_subnet:
     type: OS::Neutron::Subnet
     properties:
       name:
         str_replace:
-          template: oam_ecomp_rand
+          template: oam_onap_rand
           params:
             rand: { get_resource: random-str }
-      network_id: { get_resource: oam_ecomp }
+      network_id: { get_resource: oam_onap }
       cidr: { get_param: oam_network_cidr }
       dns_nameservers: { get_param: dns_list }
 
@@ -350,15 +400,15 @@ resources:
     type: OS::Neutron::RouterInterface
     properties:
       router_id: { get_resource: router }
-      subnet_id: { get_resource: oam_ecomp_subnet }
+      subnet_id: { get_resource: oam_onap_subnet }
 
 
   # DNS Server instantiation
   dns_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: dns_ip_addr }}]
+      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
@@ -385,7 +435,7 @@ resources:
           params:
             __nexus_repo__: { get_param: nexus_repo }
             __artifacts_version__: { get_param: artifacts_version }
-            __oam_network_cidr__: { get_attr: [oam_ecomp_subnet, cidr] }
+            __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 }
@@ -438,8 +488,8 @@ resources:
   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: aai1_ip_addr }}]
+      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
@@ -476,6 +526,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __aai_repo__: { get_param: aai_repo }
           template: |
             #!/bin/bash
 
@@ -493,6 +544,7 @@ resources:
             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
@@ -504,8 +556,8 @@ resources:
   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 }}]
+      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
@@ -541,6 +593,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __aai_repo__: { get_param: aai_repo }
           template: |
             #!/bin/bash
 
@@ -558,6 +611,7 @@ resources:
             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
@@ -570,8 +624,8 @@ resources:
   mso_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: mso_ip_addr }}]
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: mso_ip_addr }}]
 
   mso_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -612,6 +666,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __mso_repo__: { get_param: mso_repo }
           template: |
             #!/bin/bash
 
@@ -633,6 +688,7 @@ resources:
             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 "__mso_repo__" > /opt/config/remote_repo.txt
 
             # Download and run install script
             curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh
@@ -645,8 +701,8 @@ resources:
   mrouter_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: mr_ip_addr }}]
+      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
@@ -680,6 +736,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __mr_repo__: { get_param: mr_repo }
           template: |
             #!/bin/bash
 
@@ -694,6 +751,7 @@ resources:
             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
@@ -706,8 +764,8 @@ resources:
   robot_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: robot_ip_addr }}]
+      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
@@ -736,7 +794,7 @@ resources:
             __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_ecomp, name] }
+            __network_name__: { get_attr: [oam_onap, name] }
             __openstack_username__: { get_param: openstack_username }
             __openstack_api_key__: { get_param : openstack_api_key }
             __artifacts_version__: { get_param: artifacts_version }
@@ -758,8 +816,9 @@ resources:
             __sdnc_ip_addr__: { get_param: sdnc_ip_addr }
             __vid_ip_addr__: { get_param: vid_ip_addr }
             __external_dns__: { get_param: external_dns }
-            __vm_image_name__: { get_param: ubuntu_1404_image}
-            __vm_flavor__: { get_param: flavor_medium}
+            __vm_image_name__: { get_param: ubuntu_1404_image }
+            __vm_flavor__: { get_param: flavor_medium }
+            __robot_repo__: { get_param: robot_repo }
           template: |
             #!/bin/bash
 
@@ -793,6 +852,7 @@ 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 "__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
@@ -805,8 +865,8 @@ resources:
   vid_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: vid_ip_addr }}]
+      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
@@ -841,6 +901,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __vid_repo__: { get_param: vid_repo }
           template: |
             #!/bin/bash
 
@@ -856,6 +917,7 @@ resources:
             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
@@ -868,8 +930,8 @@ resources:
   sdnc_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: sdnc_ip_addr }}]
+      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
@@ -904,6 +966,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __sdnc_repo__: { get_param: sdnc_repo }
           template: |
             #!/bin/bash
 
@@ -919,6 +982,7 @@ resources:
             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 "__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
@@ -931,8 +995,8 @@ resources:
   sdc_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
+      network: { get_resource: oam_sdc }
+      fixed_ips: [{"subnet": { get_resource: oam_sdc_subnet }, "ip_address": { get_param: sdc_ip_addr }}]
 
   sdc_floating_ip:
     type: OS::Neutron::FloatingIP
@@ -979,6 +1043,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __sdc_repo__: { get_param: sdc_repo }
           template: |
             #!/bin/bash
 
@@ -997,6 +1062,7 @@ resources:
             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__/asdc_install.sh -o /opt/asdc_install.sh
@@ -1009,8 +1075,8 @@ resources:
   portal_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: portal_ip_addr }}]
+      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
@@ -1046,6 +1112,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __portal_repo__: { get_param: portal_repo }
           template: |
             #!/bin/bash
 
@@ -1062,6 +1129,7 @@ resources:
             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 "__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
@@ -1074,8 +1142,8 @@ resources:
   dcae_c_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: dcae_ip_addr }}]
+      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
@@ -1111,7 +1179,7 @@ resources:
             __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_ecomp, name] }
+            __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 }
@@ -1147,6 +1215,8 @@ resources:
             __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
 
@@ -1199,6 +1269,8 @@ resources:
             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
@@ -1211,8 +1283,8 @@ resources:
   policy_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: policy_ip_addr }}]
+      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
@@ -1248,6 +1320,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __policy_repo__: { get_param: policy_repo }
           template: |
             #!/bin/bash
 
@@ -1264,6 +1337,7 @@ resources:
             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
@@ -1276,8 +1350,8 @@ resources:
   appc_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: appc_ip_addr }}]
+      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
@@ -1313,6 +1387,7 @@ resources:
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
             __external_dns__: { get_param: external_dns }
+            __appc_repo__: { get_param: appc_repo }
           template: |
             #!/bin/bash
 
@@ -1329,6 +1404,7 @@ resources:
             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 "__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