diff options
| author |   Yang Xu <yang.xu3@huawei.com> | 2018-09-18 15:51:53 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-18 15:51:53 +0000 |
| commit | 259378a195e1079cc5d78f1933ecc1734b84849b (patch) | |
| tree | c4dffccb84c815208d64cd00f557f71f7a8bf3a4 | |
| parent | 09a544c2d95de2649ec30c5e521d3b503a5fe478 (diff) | |
| parent | 0bf673eae5718d82959c51648b4f483ca024d61f (diff) | |
Merge "Change OOM k8s to 6 x 32 GB k8s VMs"
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index e8b0ffa7d..9b9495a33 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -205,6 +205,7 @@ resources: 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], + get_attr: [k8s_6_floating_ip, floating_ip_address], ] __k8s_private_ips__: [ get_attr: [k8s_1_floating_ip, fixed_ip_address], @@ -212,6 +213,7 @@ resources: 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], + get_attr: [k8s_6_floating_ip, fixed_ip_address], ] k8s_1_private_port: type: OS::Neutron::Port @@ -393,6 +395,42 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_6_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_6_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_6_private_port } + + k8s_6_vm: + type: OS::Nova::Server + properties: + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s_6']] + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: k8s_6_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 @@ -418,3 +456,7 @@ outputs: description: The IP address of the k8s_5 instance value: { get_attr: [k8s_5_floating_ip, floating_ip_address] } + k8s_6_vm_ip: + description: The IP address of the k8s_6 instance + value: { get_attr: [k8s_6_floating_ip, floating_ip_address] } + |