diff options
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 72 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 559 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 75 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 610 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 72 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 541 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 49 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 336 |
8 files changed, 1752 insertions, 562 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index b94bcca2..74a9c8ed 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -20,6 +20,8 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + vm_base_name: vm1 key_name: onap_key @@ -38,10 +40,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -67,10 +65,10 @@ parameters: dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems) external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE + oam_network_cidr: 10.0.0.0/16 ### Private IP addresses ### - oam_network_cidr: 10.0.0.0/16 aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -81,7 +79,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -89,6 +87,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE @@ -114,4 +114,62 @@ parameters: gitlab_branch: master - dcae_code_version: 1.1.0
\ No newline at end of file + dcae_code_version: 1.1.0 + + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-STAGING-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.1-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + + ##################### + # # + # 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 + so_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 + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 48339997..8258232e 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -68,6 +68,10 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + vm_base_name: type: string description: Base name of ONAP VMs @@ -100,15 +104,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -127,7 +122,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -155,102 +150,61 @@ parameters: type: string description: First element of the dns_list for ONAP network - ### Private IP addresses ### oam_network_cidr: type: string description: CIDR of the OAM ONAP network + ### Private IP addresses ### aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address - + clamp_ip_addr: + type: string + openo_ip_addr: + type: string dcae_coll_float_ip: type: string - description: DCAE Collector Floating IP Address - dcae_db_float_ip: type: string - description: DCAE Collector Database Floating IP Address - dcae_hdp1_float_ip: type: string - description: Hadoop VM1 Floating IP Address - dcae_hdp2_float_ip: type: string - description: Hadoop VM2 Floating IP Address - dcae_hdp3_float_ip: type: string - description: Hadoop VM3 Floating IP Address ########################### # # @@ -290,6 +244,107 @@ parameters: type: string description: DCAE Code Version Number + ##################### + # # + # ONAP repositories # + # # + ##################### + + aai_repo: + type: string + appc_repo: + type: string + dcae_repo: + type: string + mr_repo: + type: string + so_repo: + type: string + policy_repo: + type: string + portal_repo: + type: string + robot_repo: + type: string + sdc_repo: + type: string + sdnc_repo: + type: string + vid_repo: + type: string + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + dgbuilder_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string + ############# # # @@ -319,24 +374,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 +405,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,14 +440,14 @@ 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 } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -400,6 +455,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -417,7 +474,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -425,6 +482,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -438,8 +497,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 @@ -472,10 +531,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -493,19 +553,20 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: type: OS::Neutron::Port properties: - network: { get_resource: oam_ecomp } - fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai2_ip_addr }}] + 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 @@ -537,10 +598,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -558,40 +620,41 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_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: so_ip_addr }}] - mso_floating_ip: + so_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: mso_private_port } + port_id: { get_resource: so_private_port } - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -608,10 +671,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -633,20 +697,21 @@ 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 "__so_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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation 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 @@ -677,9 +742,10 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __mr_repo__: { get_param: mr_repo } template: | #!/bin/bash @@ -694,6 +760,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 +773,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,30 +803,34 @@ 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_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: mr_docker } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_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 @@ -772,6 +843,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -782,17 +854,20 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt 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 +880,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 @@ -837,10 +912,11 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __vid_repo__: { get_param: vid_repo } template: | #!/bin/bash @@ -856,6 +932,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 +945,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 @@ -900,10 +977,12 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdnc_repo__: { get_param: sdnc_repo } template: | #!/bin/bash @@ -917,8 +996,10 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 +1012,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 @@ -975,10 +1056,11 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdc_repo__: { get_param: sdc_repo } template: | #!/bin/bash @@ -997,20 +1079,21 @@ 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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation 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 @@ -1042,10 +1125,11 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -1062,6 +1146,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 +1159,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 +1196,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 } @@ -1122,8 +1207,8 @@ resources: __openstack_region__: { get_param: openstack_region } __horizon_url__: { get_param: horizon_url } __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: dcae_docker } + __gerrit_branch__: { get_param: dcae_branch } __dcae_code_version__: { get_param: dcae_code_version } __cloud_env__: { get_param: cloud_env } __public_net_id__: { get_param: public_net_id } @@ -1147,6 +1232,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 +1286,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 +1300,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 @@ -1244,10 +1333,11 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1264,6 +1354,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 +1367,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 @@ -1309,10 +1400,12 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1327,11 +1420,195 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 cd /opt chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + ./appc_install.sh + + + # CLAMP instantiation + clamp_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] + + clamp_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: clamp_private_port } + + clamp_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-clamp + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: clamp_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __dmaap_topic__: { get_param: dmaap_topic } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __clamp_repo__: { get_param: clamp_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt + 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 "__external_dns__" > /opt/config/external_dns.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh + cd /opt + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: openo_private_port } + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index 4f3a42df..4b7e9f4f 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -24,6 +24,8 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xxlarge: PUT THE XXLARGE FLAVOR NAME HERE + vm_base_name: vm1 key_name: onap_key @@ -42,10 +44,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -71,6 +69,7 @@ parameters: dns_list: PUT THE ADDRESS OF THE EXTERNAL DNS HERE (e.g. a comma-separated list of IP addresses in your /etc/resolv.conf in UNIX-based Operating Systems) external_dns: PUT THE FIRST ADDRESS OF THE EXTERNAL DNS LIST HERE + oam_network_cidr: 10.0.0.0/16 ### Floating IP addresses ### @@ -84,7 +83,7 @@ parameters: dcae_hdp2_float_ip: PUT DCAE HADOOP VM2 FLOATING IP HERE dcae_hdp3_float_ip: PUT DCAE HADOOP VM3 FLOATING IP HERE dns_float_ip: PUT DNS FLOATING IP HERE - mso_float_ip: PUT MSO FLOATING IP HERE + so_float_ip: PUT SO FLOATING IP HERE mr_float_ip: PUT MESSAGE ROUTER FLOATING IP HERE policy_float_ip: PUT POLICY FLOATING IP HERE portal_float_ip: PUT PORTAL FLOATING IP HERE @@ -92,11 +91,11 @@ parameters: sdc_float_ip: PUT SDC FLOATING IP HERE sdnc_float_ip: PUT SDN-C FLOATING IP HERE vid_float_ip: PUT VID FLOATING IP HERE - + clamp_float_ip: PUT CLAMP FLOATING IP HERE + openo_float_ip: PUT OPEN-O FLOATING IP HERE ### Private IP addresses ### - oam_network_cidr: 10.0.0.0/16 aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -107,7 +106,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -115,6 +114,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 ########################### # # @@ -135,3 +136,61 @@ parameters: gitlab_branch: master dcae_code_version: 1.1.0 + + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-STAGING-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.1-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + + ##################### + # # + # 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 + so_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 + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index af49a776..438be715 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -44,14 +44,6 @@ parameters: type: string description: Public network for floating IP address allocation - public_subnet_id: - type: string - description: Public network subnet id - - router_gateway_ip: - type: string - description: Public network gateway IP address - ubuntu_1404_image: type: string description: Name of the Ubuntu 14.04 image @@ -76,6 +68,10 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + vm_base_name: type: string description: Base name of ONAP VMs @@ -108,15 +104,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -135,7 +122,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -149,6 +136,7 @@ parameters: type: string description: Cloud Provider Name + ###################### # # # Network parameters # @@ -163,155 +151,94 @@ parameters: type: string description: First element of the dns_list for ONAP network + oam_network_cidr: + type: string + description: CIDR of the OAM ONAP network + ### Floating IP addresses ### aai1_float_ip: type: string - description: AAI Instance 1 Floating IP Address - aai2_float_ip: type: string - description: AAI Instance 2 Floating IP Address - appc_float_ip: type: string - description: APP-C Floating IP Address - dcae_float_ip: type: string - description: DCAE Floating IP Address - dcae_coll_float_ip: type: string - description: DCAE Collector Floating IP Address - dcae_db_float_ip: type: string - description: DCAE Collector Database Floating IP Address - dcae_hdp1_float_ip: type: string - description: Hadoop VM1 Floating IP Address - dcae_hdp2_float_ip: type: string - description: Hadoop VM2 Floating IP Address - dcae_hdp3_float_ip: type: string - description: Hadoop VM3 Floating IP Address - dns_float_ip: type: string - description: DNS Floating IP Address - - mso_float_ip: + so_float_ip: type: string - description: MSO Floating IP Address - mr_float_ip: type: string - description: Message Router Floating IP Address - policy_float_ip: type: string - description: Policy Engine Floating IP Address - portal_float_ip: type: string - description: Portal Floating IP Address - robot_float_ip: type: string - description: Robot Framework Floating IP Address - sdc_float_ip: type: string - description: SDC Floating IP Address - sdnc_float_ip: type: string - description: SDN-C Floating IP Address - vid_float_ip: type: string - description: VID Floating IP Address - - ### Private IP addresses ### - oam_network_cidr: + clamp_float_ip: type: string - description: CIDR of the OAM ONAP network + openo_float_ip: + type: string + + ### Private IP addresses ### aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address + clamp_ip_addr: + type: string + openo_ip_addr: + type: string ########################### @@ -352,6 +279,107 @@ parameters: type: string description: DCAE Code Version Number + ##################### + # # + # ONAP repositories # + # # + ##################### + + aai_repo: + type: string + appc_repo: + type: string + dcae_repo: + type: string + mr_repo: + type: string + so_repo: + type: string + policy_repo: + type: string + portal_repo: + type: string + robot_repo: + type: string + sdc_repo: + type: string + sdnc_repo: + type: string + vid_repo: + type: string + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + dgbuilder_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string + ############# # # @@ -381,24 +409,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 +443,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,14 +479,14 @@ 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 } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -466,6 +494,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -483,7 +513,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -491,6 +521,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -504,8 +536,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 @@ -539,10 +571,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } + __docker_version__: { get_param: aai_docker } __cloud_env__: { get_param: cloud_env } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: aai_branch } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -560,19 +593,20 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: type: OS::Neutron::Port properties: - network: { get_resource: oam_ecomp } - fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai2_ip_addr }}] + 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 @@ -605,10 +639,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } + __docker_version__: { get_param: aai_docker } __cloud_env__: { get_param: cloud_env } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: aai_branch } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -626,41 +661,42 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_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: so_ip_addr }}] - mso_floating_ip: + so_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: mso_private_port } - floating_ip_address: { get_param: mso_float_ip } + port_id: { get_resource: so_private_port } + floating_ip_address: { get_param: so_float_ip } - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -677,10 +713,11 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -702,20 +739,21 @@ 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 "__so_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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation 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 @@ -747,9 +785,10 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __mr_repo__: { get_param: mr_repo } template: | #!/bin/bash @@ -764,6 +803,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 +816,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,30 +847,34 @@ 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_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_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 @@ -843,6 +887,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -853,17 +898,20 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt 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 +924,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 @@ -909,10 +957,11 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __vid_repo__: { get_param: vid_repo } template: | #!/bin/bash @@ -928,6 +977,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 +990,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 @@ -973,10 +1023,12 @@ resources: __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdnc_repo__: { get_param: sdnc_repo } template: | #!/bin/bash @@ -990,8 +1042,10 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 +1058,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 @@ -1049,10 +1103,11 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __public_ip__: { get_attr: [sdc_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdc_repo__: { get_param: sdc_repo } template: | #!/bin/bash @@ -1071,20 +1126,21 @@ 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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation 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 @@ -1117,10 +1173,11 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [portal_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -1137,6 +1194,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 +1207,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 +1245,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 } @@ -1198,8 +1256,8 @@ resources: __openstack_region__: { get_param: openstack_region } __horizon_url__: { get_param: horizon_url } __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: dcae_docker } + __gerrit_branch__: { get_param: dcae_branch } __dcae_code_version__: { get_param: dcae_code_version } __cloud_env__: { get_param: cloud_env } __public_net_id__: { get_param: public_net_id } @@ -1223,6 +1281,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 +1335,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 +1349,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 @@ -1321,10 +1383,11 @@ resources: __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } __public_ip__: { get_attr: [policy_floating_ip, floating_ip_address] } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1341,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 "__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 +1417,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 @@ -1387,10 +1451,12 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1405,11 +1471,197 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 cd /opt chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + ./appc_install.sh + + + # CLAMP instantiation + clamp_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] + + clamp_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: clamp_private_port } + floating_ip_address: { get_param: clamp_float_ip } + + clamp_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-clamp + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: clamp_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __dmaap_topic__: { get_param: dmaap_topic } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __clamp_repo__: { get_param: clamp_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt + 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 "__external_dns__" > /opt/config/external_dns.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh + cd /opt + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: openo_private_port } + floating_ip_address: { get_param: onap_float_ip } + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index dad932be..086eced4 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -20,6 +20,8 @@ parameters: flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + flavor_xlarge: PUT THE XLARGE FLAVOR NAME HERE + vm_base_name: vm1 key_name: onap_key @@ -38,10 +40,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - openstack_tenant_id: PUT YOUR OPENSTACK PROJECT ID HERE openstack_username: PUT YOUR OPENSTACK USERNAME HERE @@ -66,8 +64,10 @@ parameters: ###################### external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE - oam_network_cidr: 10.0.0.0/16 + + ### Private IP addresses ### + aai1_ip_addr: 10.0.1.1 aai2_ip_addr: 10.0.1.2 appc_ip_addr: 10.0.2.1 @@ -78,7 +78,7 @@ parameters: dcae_hdp2_ip_addr: 10.0.4.104 dcae_hdp3_ip_addr: 10.0.4.105 dns_ip_addr: 10.0.100.1 - mso_ip_addr: 10.0.5.1 + so_ip_addr: 10.0.5.1 mr_ip_addr: 10.0.11.1 policy_ip_addr: 10.0.6.1 portal_ip_addr: 10.0.9.1 @@ -86,7 +86,8 @@ parameters: sdc_ip_addr: 10.0.3.1 sdnc_ip_addr: 10.0.7.1 vid_ip_addr: 10.0.8.1 - + clamp_ip_addr: 10.0.12.1 + openo_ip_addr: 10.0.14.1 ########################### # # @@ -108,3 +109,60 @@ parameters: dcae_code_version: 1.1.0 + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + vnfsdk_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-STAGING-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.1-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + msb_docker: latest + mvim_docker: latest + vfc_docker: latest + uui_docker: latest + dgbuilder_docker: 0.1-STAGING-latest + + ##################### + # # + # 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 + so_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 + clamp_repo: http://gerrit.onap.org/r/clamp.git + vnfsdk_repo: http://gerrit.onap.org/r/vnfsdk/refrepo.git diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index b505d725..0d857ce2 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -68,6 +68,10 @@ parameters: type: string description: Name of the Extra Large Flavor supported by the cloud provider + flavor_xxlarge: + type: string + description: Name of the Extra Extra Large Flavor supported by the cloud provider + vm_base_name: type: string description: Base name of ONAP VMs @@ -100,15 +104,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - label: Version number of ONAP docker images - - gerrit_branch: - type: string - label: Gerrit code branch - description: Gerrit branch where to download the code from - dmaap_topic: type: string description: DMaaP Topic name @@ -127,7 +122,7 @@ parameters: openstack_api_key: type: string - description: Openstack API Key + description: Openstack password or API Key horizon_url: type: string @@ -151,83 +146,52 @@ parameters: type: string description: External DNS for OAM ONAP network - ### Private IP addresses ### oam_network_cidr: type: string description: CIDR of the OAM ONAP network + ### Private IP addresses ### + aai1_ip_addr: type: string - description: AAI Instance 1 IP Address - aai2_ip_addr: type: string - description: AAI Instance 2 IP Address - appc_ip_addr: type: string - description: APP-C IP Address - dcae_ip_addr: type: string - description: DCAE IP Address - dcae_coll_ip_addr: type: string - description: DCAE Collector IP Address - dcae_db_ip_addr: type: string - description: DCAE Database IP Address - dcae_hdp1_ip_addr: type: string - description: Hadoop VM1 IP Address - dcae_hdp2_ip_addr: type: string - description: Hadoop VM2 IP Address - dcae_hdp3_ip_addr: type: string - description: Hadoop VM3 IP Address - dns_ip_addr: type: string - description: DNS IP Address - - mso_ip_addr: + so_ip_addr: type: string - description: MSO IP Address - mr_ip_addr: type: string - description: Message Router IP Address - policy_ip_addr: type: string - description: Policy Engine IP Address - portal_ip_addr: type: string - description: Portal IP Address - robot_ip_addr: type: string - description: Robot Framework IP Address - sdc_ip_addr: type: string - description: SDC IP Address - sdnc_ip_addr: type: string - description: SDN-C IP Address - vid_ip_addr: type: string - description: VID IP Address - + clamp_ip_addr: + type: string + openo_ip_addr: + type: string ########################### # # @@ -267,6 +231,107 @@ parameters: type: string description: DCAE Code Version Number + ##################### + # # + # ONAP repositories # + # # + ##################### + + aai_repo: + type: string + appc_repo: + type: string + dcae_repo: + type: string + mr_repo: + type: string + so_repo: + type: string + policy_repo: + type: string + portal_repo: + type: string + robot_repo: + type: string + sdc_repo: + type: string + sdnc_repo: + type: string + vid_repo: + type: string + clamp_repo: + type: string + vnfsdk_repo: + type: string + + ################################ + # # + # Docker versions and branches # + # # + ################################ + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + msb_docker: + type: string + mvim_docker: + type: string + vfc_docker: + type: string + uui_docker: + type: string + dgbuilder_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + vnfsdk_branch: + type: string + ############# # # @@ -296,24 +361,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 +386,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 @@ -351,7 +416,7 @@ resources: __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } @@ -359,6 +424,8 @@ resources: __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -376,7 +443,7 @@ resources: echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt echo "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt @@ -384,6 +451,8 @@ resources: echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -397,8 +466,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 @@ -428,10 +497,11 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __aai_ip_addr__: { get_param: aai1_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -451,19 +521,20 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: type: OS::Neutron::Port properties: - network: { get_resource: oam_ecomp } - fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai2_ip_addr }}] + 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 @@ -492,10 +563,11 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __aai_ip_addr__: { get_param: aai2_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -515,35 +587,36 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_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: so_ip_addr }}] - mso_vm: + so_vm: type: OS::Nova::Server properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -560,12 +633,13 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -576,7 +650,7 @@ resources: echo "__nexus_username__" > /opt/config/nexus_username.txt echo "__nexus_password__" > /opt/config/nexus_password.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt - echo "__mso_ip_addr__" > /opt/config/local_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt @@ -589,20 +663,21 @@ 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 "__so_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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation 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 @@ -630,9 +705,10 @@ resources: __mr_ip_addr__: { get_param: mr_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_gerrit } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __mr_repo__: { get_param: mr_repo } template: | #!/bin/bash @@ -649,6 +725,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 +738,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,32 +763,36 @@ 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_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } __robot_ip_addr__: { get_param: robot_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __keystone_url__: { get_param: keystone_url } __aai1_ip_addr__: { get_param: aai1_ip_addr } __aai2_ip_addr__: { get_param: aai2_ip_addr } __appc_ip_addr__: { get_param: appc_ip_addr } __dcae_ip_addr__: { get_param: dcae_ip_addr } - __mso_ip_addr__: { get_param: mso_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } __mr_ip_addr__: { get_param: mr_ip_addr } __policy_ip_addr__: { get_param: policy_ip_addr } __portal_ip_addr__: { get_param: portal_ip_addr } __sdc_ip_addr__: { get_param: sdc_ip_addr } __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_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 @@ -724,6 +805,7 @@ resources: echo "__network_name__" > /opt/config/network.txt echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_api_key__" > /opt/config/openstack_password.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__robot_ip_addr__" > /opt/config/local_ip_addr.txt @@ -736,17 +818,20 @@ resources: echo "__aai2_ip_addr__" > /opt/config/aai2_ip_addr.txt echo "__appc_ip_addr__" > /opt/config/appc_ip_addr.txt echo "__dcae_ip_addr__" > /opt/config/dcae_ip_addr.txt - echo "__mso_ip_addr__" > /opt/config/mso_ip_addr.txt + echo "__so_ip_addr__" > /opt/config/so_ip_addr.txt echo "__mr_ip_addr__" > /opt/config/mr_ip_addr.txt echo "__policy_ip_addr__" > /opt/config/policy_ip_addr.txt echo "__portal_ip_addr__" > /opt/config/portal_ip_addr.txt echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__sdnc_ip_addr__" > /opt/config/sdnc_ip_addr.txt echo "__vid_ip_addr__" > /opt/config/vid_ip_addr.txt + echo "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt + echo "__openo_ip_addr__" > /opt/config/openo_ip_addr.txt echo "__cloud_env__" > /opt/config/cloud_env.txt 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 +844,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 @@ -788,10 +873,11 @@ resources: __vid_ip_addr__: { get_param: vid_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __vid_repo__: { get_param: vid_repo } template: | #!/bin/bash @@ -809,6 +895,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 +908,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 @@ -850,10 +937,12 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdnc_repo__: { get_param: sdnc_repo } template: | #!/bin/bash @@ -869,8 +958,10 @@ resources: echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 +974,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 @@ -923,10 +1014,11 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } __mr_ip_addr__: { get_param: mr_ip_addr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __sdc_repo__: { get_param: sdc_repo } template: | #!/bin/bash @@ -946,20 +1038,21 @@ 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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation 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 @@ -987,10 +1080,11 @@ resources: __portal_ip_addr__: { get_param: portal_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -1008,6 +1102,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 +1115,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 +1148,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 } @@ -1064,8 +1159,8 @@ resources: __openstack_region__: { get_param: openstack_region } __horizon_url__: { get_param: horizon_url } __keystone_url__: { get_param: keystone_url } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: dcae_docker } + __gerrit_branch__: { get_param: dcae_branch } __dcae_code_version__: { get_param: dcae_code_version } __cloud_env__: { get_param: cloud_env } __public_net_id__: { get_param: public_net_id } @@ -1083,6 +1178,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 +1227,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 +1241,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 @@ -1171,10 +1270,11 @@ resources: __policy_ip_addr__: { get_param: policy_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -1192,6 +1292,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 +1305,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 @@ -1234,10 +1335,12 @@ resources: __appc_ip_addr__: { get_param: appc_ip_addr } __dns_ip_addr__: { get_param: dns_ip_addr } __oam_network_cidr__: { get_param: oam_network_cidr } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1254,11 +1357,189 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 cd /opt chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + ./appc_install.sh + + + # CLAMP instantiation + clamp_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: clamp_ip_addr }}] + + clamp_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_medium } + name: + str_replace: + template: base-clamp + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: clamp_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __openstack_region__: { get_param: openstack_region } + __keystone_url__: { get_param: keystone_url } + __dmaap_topic__: { get_param: dmaap_topic } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __clamp_repo__: { get_param: clamp_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__clamp_ip_addr__" > /opt/config/local_ip_addr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_region__" > /opt/config/openstack_region.txt + echo "__keystone_url__" > /opt/config/keystone.txt + 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 "__external_dns__" > /opt/config/external_dns.txt + echo "__clamp_repo__" > /opt/config/remote_repo.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh + cd /opt + chmod +x clamp_install.sh + ./clamp_install.sh + + + # OPEN-O VM instantiation + openo_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": { get_param: openo_ip_addr }}] + + openo_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1604_image } + flavor: { get_param: flavor_xxlarge } + name: + str_replace: + template: base-openo-server + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: openo_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __artifacts_version__: { get_param: artifacts_version } + __dns_ip_addr__: { get_param: dns_ip_addr } + __oam_network_cidr__: { get_param: oam_network_cidr } + __aai1_ip_addr__: { get_param: aai1_ip_addr } + __aai2_ip_addr__: { get_param: aai2_ip_addr } + __appc_ip_addr__: { get_param: appc_ip_addr } + __dcae_ip_addr__: { get_param: dcae_ip_addr } + __dcae_coll_ip_addr__: { get_param: dcae_coll_ip_addr } + __so_ip_addr__: { get_param: so_ip_addr } + __mr_ip_addr__: { get_param: mr_ip_addr } + __policy_ip_addr__: { get_param: policy_ip_addr } + __portal_ip_addr__: { get_param: portal_ip_addr } + __robot_ip_addr__: { get_param: robot_ip_addr } + __sdc_ip_addr__: { get_param: sdc_ip_addr } + __sdnc_ip_addr__: { get_param: sdnc_ip_addr } + __vid_ip_addr__: { get_param: vid_ip_addr } + __clamp_ip_addr__: { get_param: clamp_ip_addr } + __openo_ip_addr__: { get_param: openo_ip_addr } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + __vnfsdk_branch__: { get_param: vnfsdk_branch } + __msb_docker__: { get_param: msb_docker } + __mvim_docker__: { get_param: mvim_docker } + __vfc_docker__: { get_param: vfc_docker } + __uui_docker__: { get_param: uui_docker } + __vnfsdk_repo__: { get_param: vnfsdk_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt + echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt + echo "__external_dns__" > /opt/config/external_dns.txt + echo "__vnfsdk_branch__" > /opt/config/vnfsdk_branch.txt + echo "__msb_docker__" > /opt/config/msb_docker.txt + echo "__mvim_docker__" > /opt/config/mvim_docker.txt + echo "__vfc_docker__" > /opt/config/vfc_docker.txt + echo "__uui_docker__" > /opt/config/uui_docker.txt + echo "__vnfsdk_repo__" > /opt/config/vnfsdk_repo.txt + + # Create env file with the IP address of all ONAP components + echo "export AAI_IP1=__aai1_ip_addr__" >> /opt/config/onap_ips.txt + echo "export AAI_IP2=__aai2_ip_addr__" >> /opt/config/onap_ips.txt + echo "export APPC_IP=__appc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_IP=__dcae_ip_addr__" >> /opt/config/onap_ips.txt + echo "export DCAE_COLL_IP=__dcae_coll_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SO_IP=__so_ip_addr__" >> /opt/config/onap_ips.txt + echo "export MR_IP=__mr_ip_addr__" >> /opt/config/onap_ips.txt + echo "export POLICY_IP=__policy_ip_addr__" >> /opt/config/onap_ips.txt + echo "export PORTAL_IP=__portal_ip_addr__" >> /opt/config/onap_ips.txt + echo "export ROBOT_IP=__robot_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDC_IP=__sdc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export SDNC_IP=__sdnc_ip_addr__" >> /opt/config/onap_ips.txt + echo "export VID_IP=__vid_ip_addr__" >> /opt/config/onap_ips.txt + echo "export CLAMP_IP=__clamp_ip_addr__" >> /opt/config/onap_ips.txt + echo "export OPENO_IP=__openo_ip_addr__" >> /opt/config/onap_ips.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/openo_install.sh -o /opt/openo_install.sh + cd /opt + chmod +x openo_install.sh + ./openo_install.sh diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 422dce3b..d92b3c71 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -32,10 +32,6 @@ parameters: artifacts_version: 1.1.0-SNAPSHOT - docker_version: 1.1-STAGING-latest - - gerrit_branch: master - cloud_env: rackspace @@ -59,10 +55,51 @@ 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, docker versions, and Gerrit branches + + 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 + so_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 + clamp_repo: http://gerrit.onap.org/r/clamp.git + + aai_branch: master + appc_branch: master + so_branch: master + mr_branch: master + dcae_branch: master + policy_branch: master + portal_branch: master + robot_branch: master + sdc_branch: master + sdnc_branch: master + vid_branch: master + clamp_branch: master + + aai_docker: 1.1-STAGING-latest + appc_docker: 1.1-STAGING-latest + so_docker: 1.1-STAGING-latest + mr_docker: 1.1-STAGING-latest + dcae_docker: 1.1-STAGING-latest + policy_docker: 1.1-STAGING-latest + portal_docker: 1.1-STAGING-latest + robot_docker: 1.1-STAGING-latest + sdc_docker: 1.1-STAGING-latest + sdnc_docker: 1.2-STAGING-latest + vid_docker: 1.1-STAGING-latest + clamp_docker: 1.1-STAGING-latest + dgbuilder_docker: 0.1-STAGING-latest diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index f62043a2..27652a4b 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -89,14 +89,6 @@ parameters: type: string description: Artifacts version of ONAP components - docker_version: - type: string - description: Docker version of ONAP docker images - - gerrit_branch: - type: string - description: Gerrit branch where to download the code from - cloud_env: type: string description: Cloud Provider Name @@ -105,7 +97,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 @@ -159,6 +151,84 @@ parameters: type: string description: Hadoop VM3 IP Address + # ONAP repositories, docker versions, and Gerrit branches + aai_repo: + type: string + appc_repo: + type: string + dcae_repo: + type: string + mr_repo: + type: string + so_repo: + type: string + policy_repo: + type: string + portal_repo: + type: string + robot_repo: + type: string + sdc_repo: + type: string + sdnc_repo: + type: string + vid_repo: + type: string + clamp_repo: + type: string + + aai_docker: + type: string + appc_docker: + type: string + so_docker: + type: string + mr_docker: + type: string + dcae_docker: + type: string + policy_docker: + type: string + portal_docker: + type: string + robot_docker: + type: string + sdc_docker: + type: string + sdnc_docker: + type: string + vid_docker: + type: string + clamp_docker: + type: string + dgbuilder_docker: + type: string + + aai_branch: + type: string + appc_branch: + type: string + so_branch: + type: string + mr_branch: + type: string + dcae_branch: + type: string + policy_branch: + type: string + portal_branch: + type: string + robot_branch: + type: string + sdc_branch: + type: string + sdnc_branch: + type: string + vid_branch: + type: string + clamp_branch: + type: string + resources: random-str: @@ -181,24 +251,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 +276,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 +320,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 @@ -288,9 +358,10 @@ resources: __nexus_password__: { get_param: nexus_password } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -307,19 +378,20 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh aai2_private_port: type: OS::Neutron::Port properties: - network: { get_resource: oam_ecomp } - fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": 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 @@ -355,9 +427,10 @@ resources: __nexus_password__: { get_param: nexus_password } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: aai_docker } + __gerrit_branch__: { get_param: aai_branch } __cloud_env__: { get_param: cloud_env } + __aai_repo__: { get_param: aai_repo } template: | #!/bin/bash @@ -374,35 +447,36 @@ 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__/aai2_install.sh -o /opt/aai2_install.sh + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh cd /opt - chmod +x aai2_install.sh - ./aai2_install.sh + chmod +x aai_install.sh + ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_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: + so_vm: type: OS::Nova::Server properties: image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) flavor: 4 GB General Purpose v1 name: str_replace: - template: base-mso + template: base-so params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - network: { get_param: public_net_id } - - port: { get_resource: mso_private_port } + - port: { get_resource: so_private_port } user_data_format: RAW user_data: str_replace: @@ -416,9 +490,10 @@ resources: __openstack_api_key__: { get_param: openstack_api_key } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: so_docker } + __gerrit_branch__: { get_param: so_branch } __cloud_env__: { get_param: cloud_env } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -437,20 +512,21 @@ 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 "__so_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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/so_install.sh -o /opt/so_install.sh cd /opt - chmod +x mso_install.sh - ./mso_install.sh + chmod +x so_install.sh + ./so_install.sh # Message Router instantiation 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 @@ -475,8 +551,9 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __gerrit_branch__: { get_param: gerrit_branch } + __gerrit_branch__: { get_param: mr_branch } __cloud_env__: { get_param: cloud_env } + __mr_repo__: { get_param: mr_repo } template: | #!/bin/bash @@ -490,6 +567,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 +580,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,15 +605,17 @@ 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 } + __openstack_tenant_id__: { get_param: openstack_tenant_id } __artifacts_version__: { get_param: artifacts_version } __openstack_region__: { get_param: openstack_region } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: robot_docker } + __gerrit_branch__: { get_param: robot_branch } __cloud_env__: { get_param: cloud_env } + __robot_repo__: { get_param: robot_repo } template: | #!/bin/bash @@ -549,6 +629,7 @@ resources: echo "__openstack_username__" > /opt/config/openstack_username.txt echo "__openstack_password__" > /opt/config/openstack_password.txt echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + echo "__openstack_tenant_id__" > /opt/config/openstack_tenant_id.txt echo "__openstack_region__" > /opt/config/region.txt echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__docker_version__" > /opt/config/docker_version.txt @@ -559,16 +640,18 @@ resources: echo "10.0.1.2" > /opt/config/aai2_ip_addr.txt echo "10.0.2.1" > /opt/config/appc_ip_addr.txt echo "10.0.4.1" > /opt/config/dcae_ip_addr.txt - echo "10.0.5.1" > /opt/config/mso_ip_addr.txt + echo "10.0.5.1" > /opt/config/so_ip_addr.txt echo "10.0.11.1" > /opt/config/mr_ip_addr.txt echo "10.0.6.1" > /opt/config/policy_ip_addr.txt echo "10.0.9.1" > /opt/config/portal_ip_addr.txt echo "10.0.3.1" > /opt/config/sdc_ip_addr.txt echo "10.0.7.1" > /opt/config/sdnc_ip_addr.txt echo "10.0.8.1" > /opt/config/vid_ip_addr.txt + echo "10.0.12.1" > /opt/config/clamp_ip_addr.txt 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 +664,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 @@ -607,9 +690,10 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: vid_docker } + __gerrit_branch__: { get_param: vid_branch } __cloud_env__: { get_param: cloud_env } + __vid_repo__: { get_param: vid_repo } template: | #!/bin/bash @@ -624,6 +708,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 +721,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 @@ -662,9 +747,11 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdnc_docker } + __gerrit_branch__: { get_param: sdnc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } + __sdnc_repo__: { get_param: sdnc_repo } template: | #!/bin/bash @@ -678,7 +765,9 @@ resources: echo "10.0.0.1" > /opt/config/dns_ip_addr.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 +780,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 @@ -742,9 +831,10 @@ resources: __nexus_password__: { get_param: nexus_password } __env_name__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: sdc_docker } + __gerrit_branch__: { get_param: sdc_branch } __cloud_env__: { get_param: cloud_env } + __sdc_repo__: { get_param: sdc_repo } template: | #!/bin/bash @@ -761,20 +851,21 @@ 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 + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/sdc_install.sh -o /opt/sdc_install.sh cd /opt - chmod +x asdc_install.sh - ./asdc_install.sh + chmod +x sdc_install.sh + ./sdc_install.sh # PORTAL instantiation 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 @@ -809,9 +900,10 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: portal_docker } + __gerrit_branch__: { get_param: portal_branch } __cloud_env__: { get_param: cloud_env } + __portal_repo__: { get_param: portal_repo } template: | #!/bin/bash @@ -826,6 +918,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 +931,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 +961,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 } @@ -877,8 +970,8 @@ resources: __pub_key__: { get_param: pub_key } __nexus_repo_root__: { get_param: nexus_repo_root } __openstack_region__: { get_param: openstack_region } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: dcae_docker } + __gerrit_branch__: { get_param: dcae_branch } __cloud_env__: { get_param: cloud_env } __dcae_code_version__: { get_param: dcae_code_version } __public_net_id__: { get_param: public_net_id } @@ -889,6 +982,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 +1023,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 +1037,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 @@ -976,9 +1073,10 @@ resources: __nexus_username__: { get_param: nexus_username } __nexus_password__: { get_param: nexus_password } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: policy_docker } + __gerrit_branch__: { get_param: policy_branch } __cloud_env__: { get_param: cloud_env } + __policy_repo__: { get_param: policy_repo } template: | #!/bin/bash @@ -993,6 +1091,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 +1104,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 @@ -1032,9 +1131,11 @@ resources: __nexus_password__: { get_param: nexus_password } __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } - __docker_version__: { get_param: docker_version } - __gerrit_branch__: { get_param: gerrit_branch } + __docker_version__: { get_param: appc_docker } + __gerrit_branch__: { get_param: appc_branch } + __dgbuilder_docker__: { get_param: dgbuilder_docker } __cloud_env__: { get_param: cloud_env } + __appc_repo__: { get_param: appc_repo } template: | #!/bin/bash @@ -1049,10 +1150,77 @@ resources: echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__dgbuilder_docker__" > /opt/config/dgbuilder_version.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 cd /opt chmod +x appc_install.sh - ./appc_install.sh
\ No newline at end of file + ./appc_install.sh + + + # CLAMP instantiation + clamp_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_onap } + fixed_ips: [{"subnet": { get_resource: oam_onap_subnet }, "ip_address": 10.0.12.1}] + + clamp_vm: + type: OS::Nova::Server + properties: + image: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) + flavor: 4 GB General Purpose v1 + name: + str_replace: + template: base-clamp + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - network: { get_param: public_net_id } + - port: { get_resource: clamp_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __nexus_repo__: { get_param: nexus_repo } + __nexus_docker_repo__: { get_param: nexus_docker_repo } + __nexus_username__: { get_param: nexus_username } + __nexus_password__: { get_param: nexus_password } + __openstack_username__: { get_param: openstack_username } + __openstack_tenant_id__: { get_param: openstack_tenant_id } + __openstack_api_key__: { get_param: openstack_api_key } + __dmaap_topic__: { get_param: dmaap_topic } + __artifacts_version__: { get_param: artifacts_version } + __docker_version__: { get_param: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } + __cloud_env__: { get_param: cloud_env } + __clamp_repo__: { get_param: clamp_repo } + template: | + #!/bin/bash + + # Create configuration files + mkdir -p /opt/config + echo "__nexus_repo__" > /opt/config/nexus_repo.txt + echo "__nexus_docker_repo__" > /opt/config/nexus_docker_repo.txt + echo "__nexus_username__" > /opt/config/nexus_username.txt + echo "__nexus_password__" > /opt/config/nexus_password.txt + echo "__artifacts_version__" > /opt/config/artifacts_version.txt + echo "10.0.0.1" > /opt/config/dns_ip_addr.txt + echo "__dmaap_topic__" > /opt/config/dmaap_topic.txt + echo "__openstack_username__" > /opt/config/openstack_username.txt + echo "__openstack_tenant_id__" > /opt/config/tenant_id.txt + echo "__openstack_api_key__" > /opt/config/openstack_api_key.txt + 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 "__clamp_repo__" > /opt/config/remote_repo.txt + + # Download and run install script + curl -k __nexus_repo__/org.onap.demo/boot/__artifacts_version__/clamp_install.sh -o /opt/clamp_install.sh + cd /opt + chmod +x clamp_install.sh + ./clamp_install.sh |