diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 13:15:06 -0600 |
|---|---|---|
| committer | Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 19:55:02 +0000 |
| commit | b894750c5133b23b5eb2f4bbf677ac1ed92db024 (patch) | |
| tree | d84c42bb2dd26cef1296d9b40413f1a61ee49c4a | |
| parent | 63620bd4dbddf54beff7ea785193c3ea73cb5540 (diff) | |
do the cleanup before deploy maas.
Change-Id: I32cccfb5cc9c9a0a6684ccfb0dbafb18c622bfb8
(cherry picked from commit f0b14493be07ef69ae237baefc486b9a45613688)
| -rwxr-xr-x | ci/02-maasdeploy.sh | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | ci/cleanvm.sh | 0 |
2 files changed, 2 insertions, 1 deletions
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 index d3345172..d3345172 100644..100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh |