summaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-11-08 20:04:33 -0800
committerGary Wu <gary.i.wu@huawei.com>2018-11-08 22:03:06 -0800
commit4b79dbb900bd1bdb1d1b221eac9f7696d5cb837f (patch)
tree2771c15a19e396d08ef155acb3659606469e47f8 /deployment
parentf6798b6488efc4e2fa03e928baaa5f8984545c76 (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')
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.env6
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env6
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml43
3 files changed, 51 insertions, 4 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index bde870976..49d02c4fb 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -5,15 +5,17 @@ parameters:
apt_proxy: 192.168.31.204:8000
docker_proxy: 192.168.31.204:5000
- rancher_vm_flavor: m1.xlarge
+ rancher_vm_flavor: m1.large
k8s_vm_flavor: m1.xlarge
etcd_vm_flavor: m1.large
- orch_vm_flavor: m1.xlarge
+ orch_vm_flavor: m1.large
public_net_id: fbe8fd92-6636-4e63-ab28-bb6a5b0888a9
oam_network_cidr: 10.0.0.0/16
+ helm_deploy_delay: 4m
+
integration_override_yaml: >
global:
repository: __docker_proxy__
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 2d28fd7ea..c6111843c 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -5,15 +5,17 @@ parameters:
apt_proxy: 10.12.5.2:8000
docker_proxy: 10.12.5.2:5000
- rancher_vm_flavor: m1.xlarge
+ rancher_vm_flavor: m1.large
k8s_vm_flavor: m1.xlarge
etcd_vm_flavor: m1.large
- orch_vm_flavor: m1.xlarge
+ orch_vm_flavor: m1.large
public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
oam_network_cidr: 10.0.0.0/16
+ helm_deploy_delay: 2.5m
+
integration_override_yaml: >
global:
repository: __docker_proxy__
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] }
+