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/rancher_vm_entrypoint.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'deployment/heat/onap-oom/rancher_vm_entrypoint.sh') diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh index 26e8378c6..098abbd39 100644 --- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh +++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh @@ -14,6 +14,7 @@ printenv mkdir -p /opt/config echo "__rancher_ip_addr__" > /opt/config/rancher_ip_addr.txt echo "__k8s_vm_ips__" > /opt/config/k8s_vm_ips.txt +echo "__k8s_private_ips__" > /opt/config/k8s_private_ips.txt echo "__public_net_id__" > /opt/config/public_net_id.txt echo "__oam_network_cidr__" > /opt/config/oam_network_cidr.txt echo "__oam_network_id__" > /opt/config/oam_network_id.txt @@ -72,7 +73,7 @@ git commit -m "initial commit" # export NFS mount NFS_EXP="" -for K8S_VM_IP in $(tr -d ',[]' < /opt/config/k8s_vm_ips.txt); do +for K8S_VM_IP in $(tr -d ',[]' < /opt/config/k8s_private_ips.txt); do NFS_EXP+="$K8S_VM_IP(rw,fsid=1,sync,no_root_squash,no_subtree_check) " done echo "/dockerdata-nfs $NFS_EXP" | tee /etc/exports @@ -100,7 +101,7 @@ wget -q http://storage.googleapis.com/kubernetes-helm/helm-v2.8.2-linux-amd64.ta tar -zxvf helm-v2.8.2-linux-amd64.tar.gz sudo mv linux-amd64/helm /usr/local/bin/helm -echo export RANCHER_IP=__rancher_ip_addr__ > api-keys-rc +echo export RANCHER_IP=__rancher_private_ip_addr__ > api-keys-rc source api-keys-rc sleep 50 @@ -169,7 +170,7 @@ clusters: - cluster: api-version: v1 insecure-skip-tls-verify: true - server: "https://$RANCHER_IP:8080/r/projects/$PID/kubernetes:6443" + server: "https://__rancher_ip_addr__:8080/r/projects/$PID/kubernetes:6443" name: "oom" contexts: - context: -- cgit 1.2.3-korg