diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-08 20:04:33 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-11-08 22:03:06 -0800 |
| commit | 4b79dbb900bd1bdb1d1b221eac9f7696d5cb837f (patch) | |
| tree | 2771c15a19e396d08ef155acb3659606469e47f8 /deployment/heat/onap-oom/onap-oom.yaml | |
| parent | f6798b6488efc4e2fa03e928baaa5f8984545c76 (diff) | |
Tweak k8s deployment footprint
Further reduce sizes of Rancher and orchestration VMs,
and use the savings to add another k8s compute VM.
Change-Id: Ie4976765d4ad3e2954886c746160f650ff9312ea
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/onap-oom.yaml')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 930032203..689bb6603 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -231,6 +231,7 @@ resources: get_attr: [k8s_09_floating_ip, floating_ip_address], get_attr: [k8s_10_floating_ip, floating_ip_address], get_attr: [k8s_11_floating_ip, floating_ip_address], + get_attr: [k8s_12_floating_ip, floating_ip_address], ] __k8s_private_ips__: [ get_attr: [k8s_01_floating_ip, fixed_ip_address], @@ -244,6 +245,7 @@ resources: get_attr: [k8s_09_floating_ip, fixed_ip_address], get_attr: [k8s_10_floating_ip, fixed_ip_address], get_attr: [k8s_11_floating_ip, fixed_ip_address], + get_attr: [k8s_12_floating_ip, fixed_ip_address], ] k8s_01_private_port: type: OS::Neutron::Port @@ -652,6 +654,43 @@ resources: template: get_file: k8s_vm_entrypoint.sh + k8s_12_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_12_floating_ip: + type: OS::Neutron::FloatingIP + properties: + floating_network_id: { get_param: public_net_id } + port_id: { get_resource: k8s_12_private_port } + + k8s_12_vm: + type: OS::Nova::Server + properties: + name: + list_join: ['-', [ { get_param: 'OS::stack_name' }, 'k8s', '12' ] ] + image: { get_param: ubuntu_1604_image } + flavor: { get_param: k8s_vm_flavor } + key_name: { get_param: key_name } + networks: + - port: { get_resource: k8s_12_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] } + __host_label__: 'compute' + template: + get_file: k8s_vm_entrypoint.sh + etcd_1_private_port: type: OS::Neutron::Port properties: @@ -849,3 +888,7 @@ outputs: description: The IP address of the k8s_11 instance value: { get_attr: [k8s_11_floating_ip, floating_ip_address] } + k8s_12_vm_ip: + description: The IP address of the k8s_12 instance + value: { get_attr: [k8s_12_floating_ip, floating_ip_address] } + |