From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Wed, 23 Aug 2017 18:11:15 +0000 (-0500)
Subject: make sure master charm in kubernetes resolved before we are
X-Git-Tag: opnfv-5.0.RC1~30
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4b7bbc9613bf8cab6b918b5f97b1712d7a5226bf;p=joid.git

make sure master charm in kubernetes resolved before we are
 testing

Change-Id: I5da42ff08acfcdcf3049b5facd9dc2f9146a035e
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/deploy.sh b/ci/deploy.sh
index b004885d..85374e75 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -298,8 +298,7 @@ deploy
 check_status executing
 
 echo_info "Deployment finished"
-
-echo_info "Configuring public access"
+juju status --format=tabular
 
 # translate bundle.yaml to json
 python -c 'import sys, yaml, json; json.dump(yaml.load(sys.stdin), sys.stdout, indent=4)' < bundles.yaml > bundles.json
@@ -327,6 +326,9 @@ if ([ $opnfvmodel == "openstack" ]); then
     fi
 
 elif ([ $opnfvmodel == "kubernetes" ]); then
+   #Workarounf for master chanrm as it takes 5 minutes to run properly
+    check_status waiting
+    check_status executing
     echo_info "Configuring Kubernetes deployment"
 
     ./k8.sh