summaryrefslogtreecommitdiffstats
path: root/ci/02-deploybundle.sh
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-02-23 09:33:31 -0600
committerNarinder Gupta <narinder.gupta@canonical.com>2017-02-23 17:36:50 -0600
commitce2fba8990b72144649ef1a8c94b6c30f7254dae (patch)
tree91ace86d00adc266aba342c5a8aba4e9551375a1 /ci/02-deploybundle.sh
parent6da65f9cfbda23f5f8e4b5965062afcf76409b2a (diff)
modified to get the juju 2.1.0 as release juju version.
Change-Id: I03cee75fab719d986ab5556ec9189816f7c9b9ee Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/02-deploybundle.sh')
-rwxr-xr-xci/02-deploybundle.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/ci/02-deploybundle.sh b/ci/02-deploybundle.sh
index ee2cac9a..647d18b0 100755
--- a/ci/02-deploybundle.sh
+++ b/ci/02-deploybundle.sh
@@ -18,7 +18,6 @@ maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ /
if [[ "$opnfvmodel" = "openstack" ]]; then
#copy and download charms
./$opnfvsdn/fetch-charms.sh $opnfvdistro
- tar xvf common/scaleio.tar -C ./$opnfvdistro/ --strip=2 juju-scaleio/trusty/
osdomname=''
else
./kubernetes/fetch-charms.sh $opnfvdistro
@@ -31,7 +30,7 @@ check_status() {
while [ $retval -eq 0 ]; do
sleep 30
juju status > status.txt
- if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
+ if [ "$(grep -c "waiting" status.txt )" -ge 2 ]; then
echo " still waiting for machines ..."
if [ $timeoutiter -ge 240 ]; then
retval=1