diff options
author | Tim Rozet <trozet@redhat.com> | 2015-09-08 14:57:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-08 14:57:39 +0000 |
commit | e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7 (patch) | |
tree | b56c3f4dae40c8efab7ddf177c7ae9475d7cf16e /compass/deploy/func.sh | |
parent | 7f8c963b4dbcc1e57e97e2637ad5a639594319fa (diff) | |
parent | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (diff) |
Merge "Merge branch 'master' into merge-master-arno" into stable/arno
Diffstat (limited to 'compass/deploy/func.sh')
-rwxr-xr-x[-rw-r--r--] | compass/deploy/func.sh | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/compass/deploy/func.sh b/compass/deploy/func.sh index 29c2c23..49ea947 100644..100755 --- a/compass/deploy/func.sh +++ b/compass/deploy/func.sh @@ -1,19 +1,22 @@ function tear_down_machines() { - virtmachines=$(virsh list --name |grep pxe) + virtmachines=$(sudo virsh list --name |grep pxe) for virtmachine in $virtmachines; do echo "destroy $virtmachine" - virsh destroy $virtmachine + sudo virsh destroy $virtmachine if [[ "$?" != "0" ]]; then echo "destroy instance $virtmachine failed" exit 1 fi done - virtmachines=$(virsh list --all --name |grep pxe) - for virtmachine in $virtmachines; do - echo "undefine $virtmachine" - virsh undefine $virtmachine + + sudo virsh list --all|grep shut|awk '{print $2}'|xargs -n 1 sudo virsh undefine + + vol_names=$(sudo virsh vol-list default |grep .img | awk '{print $1}') + for vol_name in $vol_names; do + echo "virsh vol-delete $vol_name" + sudo virsh vol-delete $vol_name --pool default if [[ "$?" != "0" ]]; then - echo "undefine instance $virtmachine failed" + echo "vol-delete $vol_name failed!" exit 1 fi done |