summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-05 14:44:51 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-09-05 14:44:51 -0700
commit1c760c54176f529dad26b5ab1b7875231ec2e3b3 (patch)
treebb070886a1d1ed4c0ccd75232f0d5c425d9fad87
parent31789aeb778a64c25436509148b7457465b6e7cb (diff)
Change OOM k8s to 4 x 32 GB k8s VMs
Change-Id: I995abc829677b6411cf5b833473cb1aaaefef866 Issue-ID: INT-586 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--deployment/heat/onap-oom/onap-oom.yaml41
1 files changed, 0 insertions, 41 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml
index 5c99bdb75..227e884d7 100644
--- a/deployment/heat/onap-oom/onap-oom.yaml
+++ b/deployment/heat/onap-oom/onap-oom.yaml
@@ -201,14 +201,12 @@ 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
@@ -350,41 +348,6 @@ 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
@@ -406,7 +369,3 @@ 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] }
-