improvements for default virtual pod creation

This patch includes the following improvements:

- deprecate ci/00-maasdeploy.sh

- refactor cleaner sctipts

- fix MAAS_IP in default configs

Change-Id: I60f77e18ce41573a744d79b8cf468c23a7dd3385
Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>

1 files changed, 12 insertions, 21 deletions

diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index 73c61c4b..d4f1f3bd 100755
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -2,30 +2,21 @@
 
 set -ex
 
+echo " Cleanup Started ..."
+
 #use the below commands if you needs to delete the virtual machine
 # also along with envuronment destroy.
-
-echo " Cleanup Started ..."
 ./clean.sh || true
- 
-maasver=`apt-cache policy maas | grep Installed | cut -d ':' -f 2 | sed -e 's/ //'`
 
-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 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/node1-control.qcow2 /var/lib/libvirt/images/node2-compute.qcow2 /var/lib/libvirt/images/node3-control.qcow2 /var/lib/libvirt/images/node4-control.qcow2 /var/lib/libvirt/images/node5-compute.qcow2 || true
- 
-if [[ "$maasver" > "2" ]]; then
-    sudo virsh destroy bootstrap || true
-    sudo virsh undefine bootstrap || true
-    sudo rm -rf  /var/lib/libvirt/images/bootstrap.qcow2 || true
-fi
+vm_list=$(sudo virsh list --all)
+
+for vm in node1-control node2-compute node3-control node4-control \
+          node5-compute bootstrap
+do
+    echo "$vm_list" | grep -q " $vm " || continue
+    sudo virsh destroy $vm
+    sudo virsh undefine $vm
+    sudo rm -f /var/lib/libvirt/images/${vm}.qcow2
+done
 
 echo " Cleanup Finished ..."