diff options
Diffstat (limited to 'heat/ONAP/onap_rackspace.yaml')
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 165 |
1 files changed, 95 insertions, 70 deletions
diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index b7afe140..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 @@ -159,55 +151,83 @@ parameters: type: string description: Hadoop VM3 IP Address - - # ONAP repositories + # ONAP repositories, docker versions, and Gerrit branches aai_repo: type: string - description: AAI repository - appc_repo: type: string - description: APPC repository - dcae_repo: type: string - description: DCAE repository - mr_repo: type: string - description: Message Router repository - - mso_repo: + so_repo: type: string - description: MSO repository - policy_repo: type: string - description: Policy repository - portal_repo: type: string - description: Portal repository - robot_repo: type: string - description: Robot repository - sdc_repo: type: string - description: SDC repository - sdnc_repo: type: string - description: SDNC repository - vid_repo: type: string - description: VID repository - clamp_repo: type: string - description: CLAMP repository + + 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: @@ -338,8 +358,8 @@ 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: | @@ -407,8 +427,8 @@ 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: | @@ -436,27 +456,27 @@ resources: ./aai_install.sh - # MSO instantiation - mso_private_port: + # SO instantiation + so_private_port: type: OS::Neutron::Port properties: 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: @@ -470,10 +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 } - __mso_repo__: { get_param: mso_repo } + __so_repo__: { get_param: so_repo } template: | #!/bin/bash @@ -492,13 +512,13 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt echo "__cloud_env__" > /opt/config/cloud_env.txt - echo "__mso_repo__" > /opt/config/remote_repo.txt + 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 @@ -531,7 +551,7 @@ 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: | @@ -592,8 +612,8 @@ resources: __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: | @@ -620,13 +640,14 @@ 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 @@ -669,8 +690,8 @@ 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: | @@ -726,8 +747,9 @@ 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: | @@ -743,6 +765,7 @@ 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 @@ -808,8 +831,8 @@ 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: | @@ -877,8 +900,8 @@ 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: | @@ -947,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 } @@ -1050,8 +1073,8 @@ 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: | @@ -1108,8 +1131,9 @@ 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: | @@ -1126,6 +1150,7 @@ 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 @@ -1170,8 +1195,8 @@ 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: clamp_docker } + __gerrit_branch__: { get_param: clamp_branch } __cloud_env__: { get_param: cloud_env } __clamp_repo__: { get_param: clamp_repo } template: | |