summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-02-07 15:45:34 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-02-07 15:45:35 +0000
commit3b37a172d8da1358611fb7a1967e967232d9154d (patch)
treea3e319d5c86ee62f3296a7f30e6115c58e79f984
parentee25be73d1a5c58bc98a4550f67bd3d059bacbfa (diff)
parent96a7825ca91e87672644823135178737dcfea53d (diff)
Merge "bifrost: Destroy all VMs from the slave nodes"
-rwxr-xr-xprototypes/bifrost/scripts/destroy-env.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index 14869b0e2..b73092b0f 100755
--- a/prototypes/bifrost/scripts/destroy-env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -14,12 +14,12 @@ if [[ $(whoami) != "root" ]]; then
exit 1
fi
-virsh destroy jumphost.opnfvlocal || true
-virsh destroy controller00.opnfvlocal || true
-virsh destroy compute00.opnfvlocal || true
-virsh undefine jumphost.opnfvlocal || true
-virsh undefine controller00.opnfvlocal || true
-virsh undefine compute00.opnfvlocal || true
+# Delete all VMs on the slave since proposed patchsets
+# may leave undesired VM leftovers
+for vm in $(virsh list --all --name); do
+ virsh destroy $vm || true
+ virsh undefine $vm || true
+done
service ironic-conductor stop || true