diff options
| -rwxr-xr-x | ci/02-maasdeploy.sh | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | ci/cleanvm.sh | 30 |
2 files changed, 18 insertions, 16 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh index f05d1f52..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 @@ -37,6 +38,7 @@ echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init if [ -e /etc/sudoers.d/90-joid-init ]; then sudo cp /etc/sudoers.d/90-joid-init 91-joid-init sudo chown $USER:$USER 91-joid-init + sudo chmod 660 91-joid-init sudo cat 90-joid-init >> 91-joid-init sudo chown root:root 91-joid-init sudo mv 91-joid-init /etc/sudoers.d/ @@ -134,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 d3345172..5277bf40 100644..100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh @@ -8,20 +8,20 @@ set -ex echo " Cleanup Started ..." ./clean.sh - virsh destroy opnfv-maas || true - virsh destroy bootstrap || true - virsh destroy node1-control || true - virsh destroy node3-control || true - virsh destroy node4-control || true - virsh destroy node2-compute || true - virsh destroy node5-compute || true - virsh undefine opnfv-maas || true - virsh undefine bootstrap || true - virsh undefine node1-control || true - virsh undefine node3-control || true - virsh undefine node4-control || true - virsh undefine node2-compute || true - virsh undefine node5-compute || true - sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true +sudo virsh destroy opnfv-maas || true +sudo virsh destroy bootstrap || true +sudo virsh destroy node1-control || true +sudo virsh destroy node3-control || true +sudo virsh destroy node4-control || true +sudo virsh destroy node2-compute || true +sudo virsh destroy node5-compute || true +sudo virsh undefine opnfv-maas || true +sudo virsh undefine bootstrap || true +sudo virsh undefine node1-control || true +sudo virsh undefine node3-control || true +sudo virsh undefine node4-control || true +sudo virsh undefine node2-compute || true +sudo virsh undefine node5-compute || true +sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true echo " Cleanup Finished ..." |