summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-06-05 11:26:44 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-06-05 16:46:27 -0700
commit9b57d6f0945a40feec9570ea29f3da295d8af6a4 (patch)
tree5965c78d669f81a9c799c7bc00a4469ba3cba250
parentfa290e17ced19e893b3f7cf8e070f459c3aeea07 (diff)
Increase to 11 k8s VMs for stability
Issue-ID: INT-381 Change-Id: I864cf1f80c2b54fca200cd7cdb5d97e17d6f4706 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml76
-rwxr-xr-xdeployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh1
2 files changed, 77 insertions, 0 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 9cf44e41c..1a217c221 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -149,6 +149,8 @@ resources:
get_attr: [k8s_7_floating_ip, floating_ip_address],
get_attr: [k8s_8_floating_ip, floating_ip_address],
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],
]
k8s_1_private_port:
type: OS::Neutron::Port
@@ -447,6 +449,72 @@ resources:
template:
get_file: k8s_vm_entrypoint.sh
+ k8s_10_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_10_floating_ip:
+ type: OS::Neutron::FloatingIP
+ properties:
+ floating_network_id: { get_param: public_net_id }
+ port_id: { get_resource: k8s_10_private_port }
+
+ k8s_10_vm:
+ type: OS::Nova::Server
+ properties:
+ name: k8s_10
+ image: { get_param: ubuntu_1604_image }
+ flavor: { get_param: k8s_vm_flavor }
+ key_name: onap_key
+ networks:
+ - port: { get_resource: k8s_10_private_port }
+ user_data_format: RAW
+ user_data:
+ str_replace:
+ params:
+ __docker_proxy__: { get_param: docker_proxy }
+ __apt_proxy__: { get_param: apt_proxy }
+ __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+ template:
+ get_file: k8s_vm_entrypoint.sh
+
+ k8s_11_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_11_floating_ip:
+ type: OS::Neutron::FloatingIP
+ properties:
+ floating_network_id: { get_param: public_net_id }
+ port_id: { get_resource: k8s_11_private_port }
+
+ k8s_11_vm:
+ type: OS::Nova::Server
+ properties:
+ name: k8s_11
+ image: { get_param: ubuntu_1604_image }
+ flavor: { get_param: k8s_vm_flavor }
+ key_name: onap_key
+ networks:
+ - port: { get_resource: k8s_11_private_port }
+ user_data_format: RAW
+ user_data:
+ str_replace:
+ params:
+ __docker_proxy__: { get_param: docker_proxy }
+ __apt_proxy__: { get_param: apt_proxy }
+ __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] }
+ template:
+ get_file: k8s_vm_entrypoint.sh
+
outputs:
rancher_vm_ip:
description: The IP address of the rancher instance
@@ -488,3 +556,11 @@ outputs:
description: The IP address of the k8s_9 instance
value: { get_attr: [k8s_9_floating_ip, floating_ip_address] }
+ k8s_10_vm_ip:
+ description: The IP address of the k8s_10 instance
+ value: { get_attr: [k8s_10_floating_ip, floating_ip_address] }
+
+ k8s_11_vm_ip:
+ description: The IP address of the k8s_11 instance
+ value: { get_attr: [k8s_11_floating_ip, floating_ip_address] }
+
diff --git a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
index 1ab0de762..23f969c6b 100755
--- a/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
+++ b/deployment/heat/onap-oom/scripts/gen-onap-oom-yaml.sh
@@ -52,6 +52,7 @@ cat <<EOF
__integration_override_yaml__: { get_param: integration_override_yaml }
__oam_network_id__: { get_resource: oam_network }
__oam_subnet_id__: { get_resource: oam_subnet }
+ __k8s_1_vm_ip__: { get_attr: [k8s_1_floating_ip, floating_ip_address] }
__k8s_vm_ips__: [
EOF