-virsh destroy instack 2> /dev/null || echo -n ''
-virsh undefine instack --remove-all-storage 2> /dev/null || echo -n ''
-
-rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null
-for i in $(seq 0 vm_index); do
- virsh destroy baremetalbrbm_$i 2> /dev/null || echo -n ''
- virsh undefine baremetalbrbm_$i --remove-all-storage 2> /dev/null || echo -n ''
- rm -f /var/lib/libvirt/images/baremetalbrbm_${i}.qcow2 2> /dev/null
+ovs_bridges="br-admin br-private br-public br-storage"
+OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network"
+
+# Clean off instack/undercloud VM
+for vm in instack undercloud; do
+ virsh destroy $vm 2> /dev/null | xargs echo -n
+ virsh undefine $vm 2> /dev/null | xargs echo -n
+ /usr/bin/touch /var/lib/libvirt/images/${vm}.qcow2
+ virsh vol-delete ${vm}.qcow2 --pool default 2> /dev/null | xargs echo -n
+ rm -f /var/lib/libvirt/images/${vm}.qcow2 2> /dev/null
+done
+
+# Clean off baremetal VMs in case they exist
+for i in $(seq 0 $vm_index); do
+ virsh destroy baremetal$i 2> /dev/null | xargs echo -n
+ virsh undefine baremetal$i 2> /dev/null | xargs echo -n
+ /usr/bin/touch /var/lib/libvirt/images/baremetal${i}.qcow2
+ virsh vol-delete baremetal${i}.qcow2 --pool default 2> /dev/null | xargs echo -n
+ rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null