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, 106 insertions, 34 deletions

diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index 1283dd10..a5037408 100644
--- a/heat/ONAP/onap_rackspace.yaml
+++ b/heat/ONAP/onap_rackspace.yaml
@@ -105,7 +105,7 @@ parameters:
   # Parameters for DCAE instantiation
   dcae_base_environment:
     type: string
-    description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...)
+    description: DCAE Base Environment configuration (for this template, only RACKSPACE is supported)
 
   dcae_zone:
     type: string
@@ -160,6 +160,52 @@ parameters:
     description: Hadoop VM3 IP Address
 
 
+  # 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
+
+
 resources:
   random-str:
     type: OS::Heat::RandomString
@@ -181,24 +227,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: 10.0.0.0/16
 
 
@@ -206,8 +252,8 @@ resources:
   dns_private_port:
     type: OS::Neutron::Port
     properties:
-      network: { get_resource: oam_ecomp }
-      fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 10.0.0.1}]
+      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
@@ -250,8 +296,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": 10.0.1.1}]
+      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
@@ -291,6 +337,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __aai_repo__: { get_param: aai_repo }
           template: |
             #!/bin/bash
 
@@ -307,6 +354,7 @@ resources:
             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
@@ -318,8 +366,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": 10.0.1.2}]
+      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
@@ -358,6 +406,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __aai_repo__: { get_param: aai_repo }
           template: |
             #!/bin/bash
 
@@ -374,6 +423,7 @@ resources:
             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
@@ -386,8 +436,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": 10.0.5.1}]
+      network: { get_resource: oam_onap }
+      fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.5.1}]
 
   mso_vm:
     type: OS::Nova::Server
@@ -419,6 +469,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __mso_repo__: { get_param: mso_repo }
           template: |
             #!/bin/bash
 
@@ -437,6 +488,7 @@ resources:
             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 "__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
@@ -449,8 +501,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": 10.0.11.1}]
+      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
@@ -477,6 +529,7 @@ resources:
             __artifacts_version__: { get_param: artifacts_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __mr_repo__: { get_param: mr_repo }
           template: |
             #!/bin/bash
 
@@ -490,6 +543,7 @@ resources:
             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
@@ -502,8 +556,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": 10.0.10.1}]
+      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
@@ -527,7 +581,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 }
             __openstack_password__: { get_param: openstack_password }
@@ -536,6 +590,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __robot_repo__: { get_param: robot_repo }
           template: |
             #!/bin/bash
 
@@ -569,6 +624,7 @@ resources:
             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
@@ -581,8 +637,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": 10.0.8.1}]
+      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
@@ -610,6 +666,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __vid_repo__: { get_param: vid_repo }
           template: |
             #!/bin/bash
 
@@ -624,6 +681,7 @@ resources:
             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
@@ -636,8 +694,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": 10.0.7.1}]
+      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
@@ -665,6 +723,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __sdnc_repo__: { get_param: sdnc_repo }
           template: |
             #!/bin/bash
 
@@ -679,6 +738,7 @@ resources:
             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 "__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
@@ -691,8 +751,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": 10.0.3.1}]
+      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
@@ -745,6 +805,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __sdc_repo__: { get_param: sdc_repo }
           template: |
             #!/bin/bash
 
@@ -761,6 +822,7 @@ resources:
             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__/asdc_install.sh -o /opt/asdc_install.sh
@@ -773,8 +835,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": 10.0.9.1}]
+      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
@@ -812,6 +874,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __portal_repo__: { get_param: portal_repo }
           template: |
             #!/bin/bash
 
@@ -826,6 +889,7 @@ resources:
             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 "__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
@@ -838,8 +902,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": 10.0.4.1}]
+      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:
@@ -868,7 +932,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 }
@@ -889,6 +953,8 @@ resources:
             __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
 
@@ -928,6 +994,8 @@ resources:
             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
@@ -940,8 +1008,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": 10.0.6.1}]
+      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
@@ -979,6 +1047,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __policy_repo__: { get_param: policy_repo }
           template: |
             #!/bin/bash
 
@@ -993,6 +1062,7 @@ resources:
             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
@@ -1005,8 +1075,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": 10.0.2.1}]
+      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
@@ -1035,6 +1105,7 @@ resources:
             __docker_version__: { get_param: docker_version }
             __gerrit_branch__: { get_param: gerrit_branch }
             __cloud_env__: { get_param: cloud_env }
+            __appc_repo__: { get_param: appc_repo }
           template: |
             #!/bin/bash
 
@@ -1050,6 +1121,7 @@ resources:
             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 "__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