From: Linda Wang <wangwulin@huawei.com>
Date: Wed, 14 Mar 2018 09:48:51 +0000 (+0000)
Subject: Fix k8s config
X-Git-Tag: opnfv-6.0.0~7^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=da93b6d1c6e69465730b1b4427bee78bed0bb342;p=joid.git

Fix k8s config

Change-Id: Ifc23bb7ba390eea95e138c1e2fc9de878f93f427
Signed-off-by: Linda Wang <wangwulin@huawei.com>
---

diff --git a/ci/k8.sh b/ci/k8.sh
index 6bac446c..2b901d7e 100755
--- a/ci/k8.sh
+++ b/ci/k8.sh
@@ -5,12 +5,17 @@ opnfvfeature=$1
 
 juju scp kubernetes-master/0:/home/ubuntu/config ~/joid_config/config
 
-configk8(){
-cat <<-EOF
 export KUBECONFIG=~/joid_config/config
 export KUBERNETES_PROVIDER=local
 export KUBE_MASTER_IP=`juju status kubernetes-master --format=yaml | grep public-address | cut -d ":" -f 2 | head -1 | sed "s/^[ \t]*//g"`
 export KUBE_MASTER_URL=http://${KUBE_MASTER_IP}:6443
+
+configk8(){
+cat <<-EOF
+export KUBECONFIG=${KUBECONFIG}
+export KUBERNETES_PROVIDER=${KUBERNETES_PROVIDER}
+export KUBE_MASTER_IP=${KUBE_MASTER_IP}
+export KUBE_MASTER_URL=${KUBE_MASTER_URL}
 EOF
 }