X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=prototypes%2Fbifrost%2Fscripts%2Fdestroy-env.sh;h=c75e814b73fa7d109e8311afea04928330d5331a;hb=d36c8831a33f0c91d5eec8817ba835393406d6bd;hp=b73092b0fc4ebffed156d74d908292dc8d942bf2;hpb=baf1364c9d161144c653987f91e2fdf14753f25f;p=releng.git

diff --git a/prototypes/bifrost/scripts/destroy-env.sh b/prototypes/bifrost/scripts/destroy-env.sh
index b73092b0f..c75e814b7 100755
--- a/prototypes/bifrost/scripts/destroy-env.sh
+++ b/prototypes/bifrost/scripts/destroy-env.sh
@@ -14,15 +14,23 @@ if [[ $(whoami) != "root" ]]; then
     exit 1
 fi
 
-# Delete all VMs on the slave since proposed patchsets
-# may leave undesired VM leftovers
-for vm in $(virsh list --all --name); do
+# Start fresh
+rm -rf /opt/stack
+# HOME is normally set by sudo -H
+rm -rf ${HOME}/.config/openstack
+
+# Delete all libvirt VMs and hosts from vbmc (look for a port number)
+for vm in $(vbmc list | awk '/[0-9]/{{ print $2 }}'); do
     virsh destroy $vm || true
     virsh undefine $vm || true
+    vbmc delete $vm
 done
 
 service ironic-conductor stop || true
 
+echo "removing inventory files created by previous builds"
+rm -rf /tmp/baremetal.*
+
 echo "removing ironic database"
 if $(which mysql &> /dev/null); then
     mysql -u root ironic --execute "drop database ironic;"
@@ -47,6 +55,6 @@ rm -rf /var/lib/libvirt/images/*.qcow2
 echo "restarting services"
 service dnsmasq restart || true
 service libvirtd restart
-service ironic-api restart || true 
+service ironic-api restart || true
 service ironic-conductor start || true
 service ironic-inspector restart || true