diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-31 12:30:54 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-10-31 14:42:33 -0700 |
| commit | 895a4acfea7afa608b6b0762355fb6b014707df3 (patch) | |
| tree | 6cfcf8936936d7e70b9697ca4e958c4532482e8a /deployment/heat/onap-oom/onap-oom.yaml | |
| parent | 5b074b87335a98ba08b41f1e89d36f25fd25d798 (diff) | |
Reduce OOM k8s footprint further
Reduce OOM k8s footprint by using the Rancher VM
as the orchestration node.
Also cleaned up the rancher deployment script.
Change-Id: Ic5594eac2830d83d58d2b0a1fa5eee770d97063d
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/onap-oom.yaml')
| -rw-r--r-- | deployment/heat/onap-oom/onap-oom.yaml | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index dc06512bb..436c67ff1 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -713,43 +713,6 @@ resources: template: get_file: k8s_vm_entrypoint.sh - orch_1_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 } - - orch_1_floating_ip: - type: OS::Neutron::FloatingIP - properties: - floating_network_id: { get_param: public_net_id } - port_id: { get_resource: orch_1_private_port } - - orch_1_vm: - type: OS::Nova::Server - properties: - name: - list_join: ['-', [ { get_param: 'OS::stack_name' }, 'orch', '1' ] ] - image: { get_param: ubuntu_1604_image } - flavor: { get_param: orch_vm_flavor } - key_name: { get_param: key_name } - networks: - - port: { get_resource: orch_1_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__: 'orchestration' - template: - get_file: k8s_vm_entrypoint.sh - outputs: rancher_vm_ip: description: The IP address of the rancher instance |