From 9f8dc4af00ff76614b85727c898c51ad23d02582 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Tue, 20 Feb 2018 12:47:15 -0600 Subject: modfiied to reflect the supported version only. Change-Id: Ib8fd3588376a160a4e1c9260ed7a6b51635f6152 Signed-off-by: Narinder Gupta --- ci/genBundle.py | 8 ++++---- ci/k8.sh | 13 +++++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ci/genBundle.py b/ci/genBundle.py index ffe9cb8f..2bd62db8 100644 --- a/ci/genBundle.py +++ b/ci/genBundle.py @@ -200,12 +200,12 @@ if 'radosgwcluster' in extra: if 'hugepages' in extra: config['os']['beta']['huge_pages'] = True config['os']['beta']['cpu_pin'] = True -if 'mitaka' in extra: - config['os']['release'] = 'mitaka' +if 'ocata' in extra: + config['os']['release'] = 'ocata' if 'trusty' in extra: config['ubuntu']['release'] = 'trusty' - if 'liberty' in extra: - config['os']['release'] = 'liberty' + if 'ocata' in extra: + config['os']['release'] = 'mitaka' if 'xenial' in extra: config['ubuntu']['release'] = 'xenial' if 'dishypcon' in extra: diff --git a/ci/k8.sh b/ci/k8.sh index 51b2f571..e2607333 100755 --- a/ci/k8.sh +++ b/ci/k8.sh @@ -3,6 +3,19 @@ set -ex 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` +export KUBE_MASTER_URL=http://${KUBE_MASTER_IP}:6443 +EOF +} + +configk8 > ~/joid_config/k8config + juju run-action kubernetes-worker/0 microbot replicas=3 juju config kubernetes-master enable-dashboard-addons=true || true juju expose kubernetes-worker || true -- cgit 1.2.3-korg