From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 22 Jan 2016 19:15:06 +0000 (-0600)
Subject: do the cleanup before deploy maas.
X-Git-Tag: brahmaputra.1.0~53^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b894750c5133b23b5eb2f4bbf677ac1ed92db024;p=joid.git

do the cleanup before deploy maas.

Change-Id: I32cccfb5cc9c9a0a6684ccfb0dbafb18c622bfb8
(cherry picked from commit f0b14493be07ef69ae237baefc486b9a45613688)
---

diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index f05d1f52..bc719f88 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -22,6 +22,7 @@ case "$1" in
         ;;
     * )
         virtinstall=1
+        ./cleanvm.sh
         cp maas/default/deployment.yaml ./deployment.yaml
         ;;
 esac
@@ -134,7 +135,7 @@ apikey=`grep maas-oauth: environments.yaml | cut -d "'" -f 2`
 maas login maas http://${maas_ip}/MAAS/api/1.0 ${apikey}
 maas maas boot-source update 1 url="http://maas.ubuntu.com/images/ephemeral-v2/daily/"
 #maas maas boot-source-selections create 1 os="ubuntu" release="precise" arches="amd64" subarches="*" labels="*"
-maas maas boot-resources import
+maas maas node-groups import-boot-images
 maas maas sshkeys new key="`cat $HOME/.ssh/id_rsa.pub`"
 
 #Added the Qtip public to run the Qtip test after install on bare metal nodes.
diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
old mode 100644
new mode 100755