diff options
Diffstat (limited to 'deployment/heat/onap-oom/onap-oom.yaml')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 59 |
1 files changed, 54 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 227e884d7..e8b0ffa7d 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -138,6 +138,8 @@ resources: router: type: OS::Neutron::Router properties: + name: + list_join: ['-', [{ get_param: 'OS::stack_name' }, 'router']] external_gateway_info: network: { get_param: public_net_id } @@ -164,7 +166,8 @@ resources: rancher_vm: type: OS::Nova::Server properties: - name: rancher + name: + list_join: ['-', [{ get_param: 'OS::stack_name' }, 'rancher']] image: { get_param: ubuntu_1604_image } flavor: { get_param: rancher_vm_flavor } key_name: { get_param: key_name } @@ -201,12 +204,14 @@ resources: get_attr: [k8s_2_floating_ip, floating_ip_address], get_attr: [k8s_3_floating_ip, floating_ip_address], get_attr: [k8s_4_floating_ip, floating_ip_address], + get_attr: [k8s_5_floating_ip, floating_ip_address], ] __k8s_private_ips__: [ get_attr: [k8s_1_floating_ip, fixed_ip_address], get_attr: [k8s_2_floating_ip, fixed_ip_address], get_attr: [k8s_3_floating_ip, fixed_ip_address], get_attr: [k8s_4_floating_ip, fixed_ip_address], + get_attr: [k8s_5_floating_ip, fixed_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -225,7 +230,8 @@ resources: k8s_1_vm: type: OS::Nova::Server properties: - name: k8s_1 + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_1']] image: { get_param: ubuntu_1604_image } flavor: { get_param: k8s_vm_flavor } key_name: { get_param: key_name } @@ -260,7 +266,8 @@ resources: k8s_2_vm: type: OS::Nova::Server properties: - name: k8s_2 + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_2']] image: { get_param: ubuntu_1604_image } flavor: { get_param: k8s_vm_flavor } key_name: { get_param: key_name } @@ -295,7 +302,8 @@ resources: k8s_3_vm: type: OS::Nova::Server properties: - name: k8s_3 + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_3']] image: { get_param: ubuntu_1604_image } flavor: { get_param: k8s_vm_flavor } key_name: { get_param: key_name } @@ -330,7 +338,8 @@ resources: k8s_4_vm: type: OS::Nova::Server properties: - name: k8s_4 + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_4']] image: { get_param: ubuntu_1604_image } flavor: { get_param: k8s_vm_flavor } key_name: { get_param: key_name } @@ -348,6 +357,42 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_5_private_port: + type: OS::Neutron::Port + properties: + network: { get_resource: oam_network } + fixed_ips: [{"subnet": { get_resource: oam_subnet }}] + security_groups: + - { get_resource: onap_sg } + + k8s_5_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_5_private_port } + + k8s_5_vm: + type: OS::Nova::Server + properties: + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_5']] + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: k8s_5_private_port } + user_data_format: RAW + user_data: + str_replace: + params: + __docker_proxy__: { get_param: docker_proxy } + __apt_proxy__: { get_param: apt_proxy } + __docker_version__: { get_param: docker_version } + __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } + template: + get_file: k8s_vm_entrypoint.sh + outputs: rancher_vm_ip: description: The IP address of the rancher instance @@ -369,3 +414,7 @@ outputs: description: The IP address of the k8s_4 instance value: { get_attr: [k8s_4_floating_ip, floating_ip_address] } + k8s_5_vm_ip: + description: The IP address of the k8s_5 instance + value: { get_attr: [k8s_5_floating_ip, floating_ip_address] } + |