Reduce k8s to 11 x 16 GB compute hosts
Also reduce size of orchestration VMs.
Change-Id: Ibc215a36d0114cb532fde60201f5ab6626bd0f90
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index b1f0da1..9680e75 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -8,7 +8,7 @@
rancher_vm_flavor: m5.xlarge
k8s_vm_flavor: m4.xlarge
etcd_vm_flavor: m1.medium
- orch_vm_flavor: m1.large
+ orch_vm_flavor: m1.medium
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index c768cd2..ce0f4fe 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -8,7 +8,7 @@
rancher_vm_flavor: m2.xlarge
k8s_vm_flavor: m1.xlarge
etcd_vm_flavor: m1.medium
- orch_vm_flavor: m1.large
+ orch_vm_flavor: m1.medium
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 609af91..61ed8a5 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -220,7 +220,6 @@
get_attr: [k8s_9_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_1_floating_ip, fixed_ip_address],
@@ -234,7 +233,6 @@
get_attr: [k8s_9_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_1_private_port:
type: OS::Neutron::Port
@@ -643,43 +641,6 @@
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:
@@ -914,7 +875,3 @@
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] }
-