diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2016-01-22 19:56:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-22 19:56:05 +0000 |
| commit | 056618ac9cfa750795649da4a94163a34868e4ec (patch) | |
| tree | c0644ca3c07d1d04afba8b5d2c740baa24a9febf | |
| parent | 47797ac75753795b7c881eb5efa28dd805672916 (diff) | |
| parent | b894750c5133b23b5eb2f4bbf677ac1ed92db024 (diff) | |
Merge "do the cleanup before deploy maas." into stable/brahmaputra
| -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 69323ef5..005419b6 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 @@ -135,7 +136,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 5277bf40..5277bf40 100644..100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh |