summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2018-03-14 13:20:32 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-14 13:20:32 +0000
commit50695387dfff29897a1b6c4c9442f786a4bc4398 (patch)
tree9d90af564c8a8379dd11443b395ddb1ece5dd22b /ci
parent42d972f661405d0851598deb21e09ebc8e7043c7 (diff)
parentda93b6d1c6e69465730b1b4427bee78bed0bb342 (diff)
Merge "Fix k8s config"
Diffstat (limited to 'ci')
-rwxr-xr-xci/k8.sh9
1 files changed, 7 insertions, 2 deletions
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
}