X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fonap_openstack.yaml;h=3929db9fc4941bef65a6db3265a1defbc3b2dd93;hb=408e5ba68e74c9c8fe642f6b06a5581a6761a344;hp=701692d20932999a625b71a78f60c02e68695dbd;hpb=6271e83bfe0a8225f63aa520fa03968a7453ddd0;p=demo.git diff --git a/heat/OpenECOMP/onap_openstack.yaml b/heat/OpenECOMP/onap_openstack.yaml index 701692d2..3929db9f 100644 --- a/heat/OpenECOMP/onap_openstack.yaml +++ b/heat/OpenECOMP/onap_openstack.yaml @@ -1,3 +1,27 @@ +########################################################################## +# +#==================LICENSE_START========================================== +# +# +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +#==================LICENSE_END============================================ +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# +########################################################################## + heat_template_version: 2015-10-15 description: Heat template to install ONAP components @@ -122,19 +146,27 @@ parameters: # Network parameters # # # ###################### - - external_dns: + + dns_list: type: comma_delimited_list - description: External DNS for OAM ONAP network + description: List of External DNS for OAM ONAP network + + external_dns: + 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 - aai_ip_addr: + aai1_ip_addr: type: string - description: AAI IP Address + description: AAI Instance 1 IP Address + + aai2_ip_addr: + type: string + description: AAI Instance 2 IP Address appc_ip_addr: type: string @@ -209,7 +241,7 @@ parameters: dcae_base_environment: type: string - description: DCAE Base Environment configuration (RACKSPACE/2-NIC/...) + description: DCAE Base Environment configuration (RACKSPACE/2-NIC/1-NIC-FLOATING-IPS) dcae_zone: type: string @@ -287,7 +319,7 @@ resources: rand: { get_resource: random-str } network_id: { get_resource: oam_ecomp } cidr: { get_param: oam_network_cidr } - dns_nameservers: { get_param: external_dns } + dns_nameservers: { get_param: dns_list } router: type: OS::Neutron::Router @@ -320,7 +352,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_small } - name: + name: str_replace: template: base-dns-server params: @@ -336,7 +368,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __oam_network_cidr__: { get_attr: [oam_ecomp_subnet, cidr] } __dns_ip_addr__: { get_param: dns_ip_addr } - __aai_ip_addr__: { get_param: aai_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 } @@ -349,7 +382,7 @@ resources: __sdnc_ip_addr__: { get_param: sdnc_ip_addr } __vid_ip_addr__: { get_param: vid_ip_addr } __cloud_env__: { get_param: cloud_env } - + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -360,7 +393,8 @@ resources: 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 "__aai_ip_addr__" > /opt/config/aai_ip_addr.txt + echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt + 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 "__dcae_coll_ip_addr__" > /opt/config/dcae_coll_ip_addr.txt @@ -372,6 +406,7 @@ 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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dns_install.sh -o /opt/dns_install.sh @@ -380,32 +415,33 @@ resources: ./dns_install.sh - # A&AI instantiation - aai_private_port: + # A&AI instantiation (2 VMs) + 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: aai_ip_addr }}] + fixed_ips: [{"subnet": { get_resource: oam_ecomp_subnet }, "ip_address": { get_param: aai1_ip_addr }}] - aai_floating_ip: + aai1_floating_ip: type: OS::Neutron::FloatingIP properties: floating_network_id: { get_param: public_net_id } - port_id: { get_resource: aai_private_port } + port_id: { get_resource: aai1_private_port } - aai_vm: + aai1_vm: type: OS::Nova::Server + depends_on: aai2_vm properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_xlarge } - name: + name: str_replace: - template: base-aai + template: base-aai-inst1 params: base: { get_param: vm_base_name } key_name: { get_resource: vm_key } networks: - - port: { get_resource: aai_private_port } + - port: { get_resource: aai1_private_port } user_data_format: RAW user_data: str_replace: @@ -417,9 +453,75 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __sdc_ip_addr__: { get_param: sdc_ip_addr } __docker_version__: { get_param: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } + 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 "__docker_version__" > /opt/config/docker_version.txt + 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 "__external_dns__" > /opt/config/external_dns.txt + + # Download and run install script + curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh + cd /opt + chmod +x aai2_install.sh + ./aai2_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 }}] + + aai2_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: aai2_private_port } + + aai2_vm: + type: OS::Nova::Server + properties: + image: { get_param: ubuntu_1404_image } + flavor: { get_param: flavor_xlarge } + name: + str_replace: + template: base-aai-inst2 + params: + base: { get_param: vm_base_name } + key_name: { get_resource: vm_key } + networks: + - port: { get_resource: aai2_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 } + __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 } + __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -431,16 +533,18 @@ resources: 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 "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt 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 "aai_instance_2" > /opt/config/aai_instance.txt echo "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script - curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai_install.sh -o /opt/aai_install.sh + curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/aai2_install.sh -o /opt/aai2_install.sh cd /opt - chmod +x aai_install.sh - ./aai_install.sh + chmod +x aai2_install.sh + ./aai2_install.sh # MSO instantiation @@ -461,7 +565,7 @@ resources: properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-mso params: @@ -480,6 +584,7 @@ resources: __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 } @@ -487,6 +592,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -502,10 +608,12 @@ resources: 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 # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mso_install.sh -o /opt/mso_install.sh @@ -532,7 +640,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-message-router params: @@ -552,6 +660,7 @@ resources: __dns_ip_addr__: { get_param: dns_ip_addr } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -565,6 +674,7 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.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 # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/mr_install.sh -o /opt/mr_install.sh @@ -591,7 +701,7 @@ resources: properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_small } - name: + name: str_replace: template: base-robot params: @@ -616,6 +726,19 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_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 } + __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 } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -633,7 +756,20 @@ resources: echo "__docker_version__" > /opt/config/docker_version.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__gerrit_branch__" > /opt/config/gerrit_branch.txt + echo "__keystone_url__" > /opt/config/keystone.txt + echo "__aai1_ip_addr__" > /opt/config/aai1_ip_addr.txt + 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 "__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 "__cloud_env__" > /opt/config/cloud_env.txt + echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/robot_install.sh -o /opt/robot_install.sh @@ -660,7 +796,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_medium } - name: + name: str_replace: template: base-vid params: @@ -681,6 +817,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -695,6 +832,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/vid_install.sh -o /opt/vid_install.sh @@ -721,7 +859,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-sdnc params: @@ -742,6 +880,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -756,6 +895,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/sdnc_install.sh -o /opt/sdnc_install.sh @@ -788,7 +928,7 @@ resources: properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_xlarge } - name: + name: str_replace: template: base-sdc params: @@ -815,6 +955,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -832,6 +973,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/asdc_install.sh -o /opt/asdc_install.sh @@ -858,7 +1000,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-portal params: @@ -880,6 +1022,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -895,6 +1038,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/portal_install.sh -o /opt/portal_install.sh @@ -921,7 +1065,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_medium } - name: + name: str_replace: template: base-dcae-controller params: @@ -967,6 +1111,13 @@ 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 } + __external_dns__: { get_param: external_dns } + __ubuntu_1404_image__: { get_param: ubuntu_1404_image } + __ubuntu_1604_image__: { get_param: ubuntu_1604_image } + __flavor_small__: { get_param: flavor_small } + __flavor_medium__: { get_param: flavor_medium } + __flavor_large__: { get_param: flavor_large } + __flavor_xlarge__: { get_param: flavor_xlarge } template: | #!/bin/bash @@ -1006,6 +1157,13 @@ 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 "__external_dns__" > /opt/config/external_dns.txt + echo "__ubuntu_1404_image__" > /opt/config/ubuntu_1404_image.txt + echo "__ubuntu_1604_image__" > /opt/config/ubuntu_1604_image.txt + echo "__flavor_small__" > /opt/config/flavor_small.txt + echo "__flavor_medium__" > /opt/config/flavor_medium.txt + echo "__flavor_large__" > /opt/config/flavor_large.txt + echo "__flavor_xlarge__" > /opt/config/flavor_xlarge.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/dcae_install.sh -o /opt/dcae_install.sh @@ -1032,7 +1190,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_xlarge } - name: + name: str_replace: template: base-policy params: @@ -1054,6 +1212,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1069,6 +1228,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/policy_install.sh -o /opt/policy_install.sh @@ -1095,7 +1255,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-appc params: @@ -1117,6 +1277,7 @@ resources: __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_branch } __cloud_env__: { get_param: cloud_env } + __external_dns__: { get_param: external_dns } template: | #!/bin/bash @@ -1132,6 +1293,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 "__external_dns__" > /opt/config/external_dns.txt # Download and run install script curl -k __nexus_repo__/org.openecomp.demo/boot/__artifacts_version__/appc_install.sh -o /opt/appc_install.sh