diff options
Diffstat (limited to 'heat/ONAP')
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack.yaml | 89 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 3 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.yaml | 94 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.yaml | 88 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.env | 1 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 71 |
8 files changed, 346 insertions, 4 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 4b13a466..964ec080 100644 --- a/heat/ONAP/onap_openstack.env +++ b/heat/ONAP/onap_openstack.env @@ -89,6 +89,7 @@ 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 dcae_coll_float_ip: PUT DCAE COLLECTOR FLOATING IP HERE dcae_db_float_ip: PUT DCAE DATABASE FLOATING IP HERE @@ -133,3 +134,4 @@ parameters: 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 diff --git a/heat/ONAP/onap_openstack.yaml b/heat/ONAP/onap_openstack.yaml index 10396c26..a99054c1 100644 --- a/heat/ONAP/onap_openstack.yaml +++ b/heat/ONAP/onap_openstack.yaml @@ -232,6 +232,10 @@ parameters: type: string description: VID IP Address + clamp_ip_addr: + type: string + description: CLAMP IP Address + dcae_coll_float_ip: type: string description: DCAE Collector Floating IP Address @@ -340,6 +344,10 @@ parameters: type: string description: VID repository + clamp_repo: + type: string + description: CLAMP repository + ############# # # @@ -450,6 +458,7 @@ 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 } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -475,6 +484,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 "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -1410,4 +1420,81 @@ resources: 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: docker_version } + __gerrit_branch__: { get_param: gerrit_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
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env index e2baf6ea..bbc70199 100644 --- a/heat/ONAP/onap_openstack_float.env +++ b/heat/ONAP/onap_openstack_float.env @@ -92,6 +92,7 @@ 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 ### Private IP addresses ### @@ -115,6 +116,7 @@ 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 ########################### # # @@ -152,3 +154,4 @@ parameters: 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 diff --git a/heat/ONAP/onap_openstack_float.yaml b/heat/ONAP/onap_openstack_float.yaml index bc15fa7f..74e24e46 100644 --- a/heat/ONAP/onap_openstack_float.yaml +++ b/heat/ONAP/onap_openstack_float.yaml @@ -236,6 +236,10 @@ parameters: type: string description: VID Floating IP Address + clamp_float_ip: + type: string + description: CLAMP Floating IP Address + ### Private IP addresses ### oam_network_cidr: type: string @@ -313,6 +317,10 @@ parameters: type: string description: VID IP Address + clamp_ip_addr: + type: string + description: CLAMP IP Address + ########################### # # @@ -402,6 +410,10 @@ parameters: type: string description: VID repository + clamp_repo: + type: string + description: CLAMP repository + ############# # # @@ -516,6 +528,7 @@ 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 } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -541,6 +554,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 "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -1488,4 +1502,82 @@ resources: 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: docker_version } + __gerrit_branch__: { get_param: gerrit_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
\ No newline at end of file diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env index 0987d580..1ef3c753 100644 --- a/heat/ONAP/onap_openstack_nofloat.env +++ b/heat/ONAP/onap_openstack_nofloat.env @@ -86,6 +86,7 @@ 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 ########################### @@ -125,3 +126,4 @@ parameters: 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 diff --git a/heat/ONAP/onap_openstack_nofloat.yaml b/heat/ONAP/onap_openstack_nofloat.yaml index 59b97026..05ba2239 100644 --- a/heat/ONAP/onap_openstack_nofloat.yaml +++ b/heat/ONAP/onap_openstack_nofloat.yaml @@ -228,6 +228,10 @@ parameters: type: string description: VID IP Address + clamp_ip_addr: + type: string + description: CLAMP IP Address + ########################### # # @@ -317,6 +321,10 @@ parameters: type: string description: VID repository + clamp_repo: + type: string + description: CLAMP repository + ############# # # @@ -409,6 +417,7 @@ 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 } __cloud_env__: { get_param: cloud_env } __external_dns__: { get_param: external_dns } template: | @@ -434,6 +443,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 "__clamp_ip_addr__" > /opt/config/clamp_ip_addr.txt echo "__external_dns__" > /opt/config/external_dns.txt # Download and run install script @@ -1337,4 +1347,80 @@ resources: 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: docker_version } + __gerrit_branch__: { get_param: gerrit_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
\ No newline at end of file diff --git a/heat/ONAP/onap_rackspace.env b/heat/ONAP/onap_rackspace.env index 4f3945bf..5c82a47f 100644 --- a/heat/ONAP/onap_rackspace.env +++ b/heat/ONAP/onap_rackspace.env @@ -83,3 +83,4 @@ parameters: 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 diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml index a5037408..260632c2 100644 --- a/heat/ONAP/onap_rackspace.yaml +++ b/heat/ONAP/onap_rackspace.yaml @@ -205,6 +205,10 @@ parameters: type: string description: VID repository + clamp_repo: + type: string + description: CLAMP repository + resources: random-str: @@ -1127,4 +1131,69 @@ resources: 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: docker_version } + __gerrit_branch__: { get_param: gerrit_branch } + __cloud_env__: { get_param: cloud_env } + __mso_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
\ No newline at end of file |