X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FOpenECOMP%2Fonap_openstack_nofloat.yaml;h=a5b7f8145a7b5bab8dd7674f054b3a044ed13872;hb=408e5ba68e74c9c8fe642f6b06a5581a6761a344;hp=b0a155d4b96c23aca3381236ed72a1e804ccc095;hpb=1c79537b57c3c23352abdd9c56840c9a9a5ffa2a;p=demo.git diff --git a/heat/OpenECOMP/onap_openstack_nofloat.yaml b/heat/OpenECOMP/onap_openstack_nofloat.yaml index b0a155d4..a5b7f814 100644 --- a/heat/OpenECOMP/onap_openstack_nofloat.yaml +++ b/heat/OpenECOMP/onap_openstack_nofloat.yaml @@ -156,9 +156,13 @@ parameters: 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 @@ -325,7 +329,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_small } - name: + name: str_replace: template: base-dns-server params: @@ -342,7 +346,8 @@ resources: __artifacts_version__: { get_param: artifacts_version } __oam_network_cidr__: { get_param: oam_network_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 } @@ -366,7 +371,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 @@ -387,27 +393,28 @@ 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_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: - network: { get_param: public_net_id } - - port: { get_resource: aai_private_port } + - port: { get_resource: aai1_private_port } user_data_format: RAW user_data: str_replace: @@ -419,10 +426,10 @@ resources: __dmaap_topic__: { get_param: dmaap_topic } __artifacts_version__: { get_param: artifacts_version } __dns_ip_addr__: { get_param: dns_ip_addr } - __aai_ip_addr__: { get_param: aai_ip_addr } - __sdc_ip_addr__: { get_param: sdc_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 } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -437,18 +444,83 @@ resources: echo "__artifacts_version__" > /opt/config/artifacts_version.txt echo "__aai_ip_addr__" > /opt/config/local_ip_addr.txt echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt - echo "__sdc_ip_addr__" > /opt/config/sdc_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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__/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 + + + 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_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: + - network: { get_param: public_net_id } + - 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 } + __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 } + __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 "__aai_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 "__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__/aai2_install.sh -o /opt/aai2_install.sh + cd /opt + chmod +x aai2_install.sh + ./aai2_install.sh # MSO instantiation @@ -463,7 +535,7 @@ resources: properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-mso params: @@ -537,7 +609,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-message-router params: @@ -597,7 +669,7 @@ resources: properties: image: { get_param: ubuntu_1604_image } flavor: { get_param: flavor_small } - name: + name: str_replace: template: base-robot params: @@ -624,6 +696,18 @@ resources: __oam_network_cidr__: { get_param: oam_network_cidr } __docker_version__: { get_param: docker_version } __gerrit_branch__: { get_param: gerrit_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 } + __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 } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -645,6 +729,18 @@ resources: echo "__dns_ip_addr__" > /opt/config/dns_ip_addr.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.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 @@ -667,7 +763,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_medium } - name: + name: str_replace: template: base-vid params: @@ -729,7 +825,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-sdnc params: @@ -866,7 +962,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-portal params: @@ -928,7 +1024,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_medium } - name: + name: str_replace: template: base-dcae-controller params: @@ -1050,7 +1146,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_xlarge } - name: + name: str_replace: template: base-policy params: @@ -1112,7 +1208,7 @@ resources: properties: image: { get_param: ubuntu_1404_image } flavor: { get_param: flavor_large } - name: + name: str_replace: template: base-appc params: