Merge "cleanup old controllers and models for virtual deployments"

diff --cc ci/deploy.sh
index d61e3ba,1ffa7da..94c7b41
--- 1/ci/deploy.sh
--- 2/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