diff options
| author |   Marco Platania <platania@research.att.com> | 2017-08-21 11:27:39 -0400 |
|---|---|---|
| committer | Marco Platania <platania@research.att.com> | 2017-08-21 11:27:39 -0400 |
| commit | df0c0cf6c8eb6bc6d3e4df5c5e3275dc425f4f6f (patch) | |
| tree | a6403912419323f34e6f5d4c18131537964689d5 /heat | |
| parent | 312996e26c793460869c5569d73cb4159a13f996 (diff) | |
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>
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 20 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 150 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 17 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 150 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 17 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 146 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 21 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 140 |
8 files changed, 515 insertions, 146 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index b94bcca2..4b13a466 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -114,4 +114,22 @@ parameters: gitlab_branch: master - dcae_code_version: 1.1.0
\ No newline at end of file + dcae_code_version: 1.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 + mso_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 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 diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 4f3a42df..e2baf6ea 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -135,3 +135,20 @@ parameters: gitlab_branch: master dcae_code_version: 1.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 + mso_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 diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index 7116abc2..bc15fa7f 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -352,6 +352,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 + ############# # # @@ -381,24 +431,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 } @@ -415,15 +465,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 @@ -451,7 +501,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 } @@ -504,8 +554,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 @@ -543,6 +593,7 @@ resources: __cloud_env__: { get_param: cloud_env } __gerrit_branch__: { get_param: gerrit_branch } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -560,6 +611,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 @@ -571,8 +623,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 @@ -609,6 +661,7 @@ resources: __cloud_env__: { get_param: cloud_env } __gerrit_branch__: { get_param: gerrit_branch } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -626,6 +679,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 @@ -638,8 +692,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 @@ -681,6 +735,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 @@ -702,6 +757,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 @@ -714,8 +770,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 @@ -750,6 +806,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 @@ -764,6 +821,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 @@ -776,8 +834,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 @@ -807,7 +865,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 } @@ -829,8 +887,9 @@ resources: __vid_ip_addr__: { get_param: vid_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} + __vm_image_name__: { get_param: ubuntu_1404_image } + __vm_flavor__: { get_param: flavor_medium } + __robot_repo__: { get_param: robot_repo } template: | #!/bin/bash @@ -864,6 +923,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 @@ -876,8 +936,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 @@ -913,6 +973,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 @@ -928,6 +989,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 @@ -940,8 +1002,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 @@ -977,6 +1039,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 @@ -992,6 +1055,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 @@ -1004,8 +1068,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_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}] sdc_floating_ip: type: OS::Neutron::FloatingIP @@ -1053,6 +1117,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 @@ -1071,6 +1136,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 @@ -1083,8 +1149,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 @@ -1121,6 +1187,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 @@ -1137,6 +1204,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 @@ -1149,8 +1217,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 @@ -1187,7 +1255,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 } @@ -1223,6 +1291,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 @@ -1275,6 +1345,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 @@ -1287,8 +1359,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 @@ -1325,6 +1397,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 @@ -1341,6 +1414,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 @@ -1353,8 +1427,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 @@ -1391,6 +1465,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 @@ -1407,6 +1482,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 diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index dad932be..0987d580 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -108,3 +108,20 @@ parameters: dcae_code_version: 1.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 + mso_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 diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 900cb376..59b97026 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -267,6 +267,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 + ############# # # @@ -296,24 +346,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 } @@ -321,8 +371,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": { 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_vm: type: OS::Nova::Server @@ -397,8 +447,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_vm: type: OS::Nova::Server @@ -432,6 +482,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 @@ -451,6 +502,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 @@ -462,8 +514,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_vm: type: OS::Nova::Server @@ -496,6 +548,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 @@ -515,6 +568,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 @@ -527,8 +581,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_vm: type: OS::Nova::Server @@ -566,6 +620,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 @@ -589,6 +644,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 @@ -601,8 +657,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_vm: type: OS::Nova::Server @@ -633,6 +689,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 @@ -649,6 +706,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 @@ -661,8 +719,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_vm: type: OS::Nova::Server @@ -686,7 +744,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 } @@ -710,8 +768,9 @@ resources: __vid_ip_addr__: { get_param: vid_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} + __vm_image_name__: { get_param: ubuntu_1404_image } + __vm_flavor__: { get_param: flavor_medium } + __robot_repo__: { get_param: robot_repo } template: | #!/bin/bash @@ -747,6 +806,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 @@ -759,8 +819,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_vm: type: OS::Nova::Server @@ -792,6 +852,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 @@ -809,6 +870,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 @@ -821,8 +883,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_vm: type: OS::Nova::Server @@ -854,6 +916,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 @@ -871,6 +934,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 @@ -883,8 +947,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_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: sdc_ip_addr }}] sdc_volume_data: type: OS::Cinder::Volume @@ -927,6 +991,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 @@ -946,6 +1011,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 @@ -958,8 +1024,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_vm: type: OS::Nova::Server @@ -991,6 +1057,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 @@ -1008,6 +1075,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 @@ -1020,8 +1088,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_vm: type: OS::Nova::Server @@ -1053,7 +1121,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 } @@ -1083,6 +1151,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 @@ -1130,6 +1200,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 @@ -1142,8 +1214,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_vm: type: OS::Nova::Server @@ -1175,6 +1247,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 @@ -1192,6 +1265,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 @@ -1204,8 +1278,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_vm: type: OS::Nova::Server @@ -1238,6 +1312,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 @@ -1256,6 +1331,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 diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 422dce3b..4f3945bf 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -59,10 +59,27 @@ parameters: # 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
\ No newline at end of file + dcae_hdp3_ip_addr: 10.0.4.105 + + + ##################### + # # + # 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 + mso_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 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 |