From: Linda Wang Date: Fri, 16 Mar 2018 02:04:05 +0000 (+0000) Subject: Fix k8s config X-Git-Tag: opnfv-6.0.0~6 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=976a5aa1011379c4a82b13f8dde4b76cbec1ba16;p=joid.git Fix k8s config Change-Id: I7ff4e53bf8c08239bd22cc09774a54c1f013b891 Signed-off-by: Linda Wang --- diff --git a/ci/k8.sh b/ci/k8.sh index 2b901d7e..40e8eb8f 100755 --- a/ci/k8.sh +++ b/ci/k8.sh @@ -5,15 +5,13 @@ opnfvfeature=$1 juju scp kubernetes-master/0:/home/ubuntu/config ~/joid_config/config -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 KUBECONFIG=~/joid_config/config +export KUBERNETES_PROVIDER=local export KUBE_MASTER_IP=${KUBE_MASTER_IP} export KUBE_MASTER_URL=${KUBE_MASTER_URL} EOF