From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Thu, 10 Aug 2017 03:20:34 +0000 (+0000)
Subject: Merge "cleanup old controllers and models for virtual deployments"
X-Git-Tag: opnfv-5.0.RC1~68
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=5bd00249a7f38a15b88dffbfd1fd02d2b76004cc;p=joid.git

Merge "cleanup old controllers and models for virtual deployments"
---

5bd00249a7f38a15b88dffbfd1fd02d2b76004cc
diff --cc ci/deploy.sh
index d61e3bad,1ffa7dab..94c7b416
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@@ -200,10 -203,14 +205,15 @@@ check_status() 
          juju expose ceph-radosgw || true
          #juju ssh ceph/0 \ 'sudo radosgw-admin user create --uid="ubuntu" --display-name="Ubuntu Ceph"'
      fi
 +
      echo "...... deployment finishing ......."
 -}
 + }
  
+ # In the case of a virtual deployment
+ if [ "$virtinstall" -eq 1 ]; then
+     ./clean.sh || true
+ fi
+ 
  echo "...... deployment started ......"
  deploy