summaryrefslogtreecommitdiffstats
path: root/deployment/heat
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-07 09:05:33 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-07 09:05:53 -0700
commit4d2cfb6d4df3f39d299012be1ed8fdb5b1cf460a (patch)
tree25c4359c8b00589ed8c2e00480a6e1b8bb46d3db /deployment/heat
parentdc0afcbbd39a144f0d7c57760b219576049fc67c (diff)
Revert "Change OOM k8s to 4 x 32 GB k8s VMs"
This reverts commit 1c760c54176f529dad26b5ab1b7875231ec2e3b3. Change-Id: I89315888739a42dd39ebedce4c78c11e390b3e46 Issue-ID: INT-586 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat')
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml41
1 files changed, 41 insertions, 0 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 227e884d7..5c99bdb75 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -201,12 +201,14 @@ resources:
get_attr: [k8s_2_floating_ip, floating_ip_address],
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],
]
__k8s_private_ips__: [
get_attr: [k8s_1_floating_ip, fixed_ip_address],
get_attr: [k8s_2_floating_ip, fixed_ip_address],
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],
]
k8s_1_private_port:
type: OS::Neutron::Port
@@ -348,6 +350,41 @@ resources:
template:
get_file: k8s_vm_entrypoint.sh
+ k8s_5_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_5_floating_ip:
+ type: OS::Neutron::FloatingIP
+ properties:
+ floating_network_id: { get_param: public_net_id }
+ port_id: { get_resource: k8s_5_private_port }
+
+ k8s_5_vm:
+ type: OS::Nova::Server
+ properties:
+ name: k8s_5
+ image: { get_param: ubuntu_1604_image }
+ flavor: { get_param: k8s_vm_flavor }
+ key_name: { get_param: key_name }
+ networks:
+ - port: { get_resource: k8s_5_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
@@ -369,3 +406,7 @@ outputs:
description: The IP address of the k8s_4 instance
value: { get_attr: [k8s_4_floating_ip, floating_ip_address] }
+ k8s_5_vm_ip:
+ description: The IP address of the k8s_5 instance
+ value: { get_attr: [k8s_5_floating_ip, floating_ip_address] }
+