From e63f44eb68b9e87b9b99a135fe75f9f9e84b1103 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Thu, 3 Nov 2016 06:50:09 -0500 Subject: added support for maas 2.0 in non virtualized environment. Change-Id: Icf024ed2cbf538df43e6bd5203685552ab6564d2 Signed-off-by: Narinder Gupta --- ci/cleanvm.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'ci/cleanvm.sh') diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh index 8259347c..f7f062a6 100755 --- a/ci/cleanvm.sh +++ b/ci/cleanvm.sh @@ -8,6 +8,8 @@ set -ex 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 @@ -20,8 +22,10 @@ sudo virsh undefine node2-compute || true sudo virsh undefine node5-compute || true sudo rm -rf /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node5-compute.img || true -#sudo virsh destroy bootstrap || true -#sudo virsh undefine bootstrap || true -#sudo rm -rf /var/lib/libvirt/images/bootstrap.img || true +if [[ "$maasver" > "2" ]]; then + sudo virsh destroy bootstrap || true + sudo virsh undefine bootstrap || true + sudo rm -rf /var/lib/libvirt/images/bootstrap.img || true +fi echo " Cleanup Finished ..." -- cgit 1.2.3-korg