From ad51372fa9e16ef29bd35fa2ef18de55964e7f65 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 26 Jul 2018 13:08:47 -0700 Subject: Use OAM IPs for k8s connectivity Use OAM IPs for k8s connectivity to reduce network congestion. Change-Id: Ia6114f1e4bf43578ee77c1d39ba36880f4c550d2 Issue-ID: INT-586 Signed-off-by: Gary Wu --- deployment/heat/onap-oom/onap-oom.yaml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'deployment/heat/onap-oom/onap-oom.yaml') diff --git a/deployment/heat/onap-oom/onap-oom.yaml b/deployment/heat/onap-oom/onap-oom.yaml index 34e71fd79..c378d0a50 100644 --- a/deployment/heat/onap-oom/onap-oom.yaml +++ b/deployment/heat/onap-oom/onap-oom.yaml @@ -151,6 +151,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __rancher_ip_addr__: { get_attr: [rancher_floating_ip, floating_ip_address] } + __rancher_private_ip_addr__: { get_attr: [rancher_floating_ip, fixed_ip_address] } __integration_override_yaml__: { get_param: integration_override_yaml } __gerrit_branch__: { get_param: gerrit_branch } __gerrit_refspec__: { get_param: gerrit_refspec } @@ -173,6 +174,19 @@ resources: get_attr: [k8s_10_floating_ip, floating_ip_address], get_attr: [k8s_11_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], + get_attr: [k8s_6_floating_ip, fixed_ip_address], + get_attr: [k8s_7_floating_ip, fixed_ip_address], + get_attr: [k8s_8_floating_ip, fixed_ip_address], + get_attr: [k8s_9_floating_ip, fixed_ip_address], + get_attr: [k8s_10_floating_ip, fixed_ip_address], + get_attr: [k8s_11_floating_ip, fixed_ip_address], + ] k8s_1_private_port: type: OS::Neutron::Port properties: @@ -203,6 +217,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -236,6 +251,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -269,6 +285,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -302,6 +319,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -335,6 +353,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -368,6 +387,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -401,6 +421,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -434,6 +455,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -467,6 +489,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -500,6 +523,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 @@ -533,6 +557,7 @@ resources: __docker_proxy__: { get_param: docker_proxy } __apt_proxy__: { get_param: apt_proxy } __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 -- cgit 1.2.3-korg