X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fclean.sh;h=368ce8bc231a979012a689b3a642beee11f51d5c;hb=542964d123fa93f1f460ed73b477c4bcaa2a2034;hp=fbbca1f8dd7bdf590bef65bfd5f6121cc28bb40b;hpb=ce801d561df163ff2ff27983067f39852947aa68;p=apex.git

diff --git a/ci/clean.sh b/ci/clean.sh
index fbbca1f8..368ce8bc 100755
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -13,13 +13,14 @@
 #author: Tim Rozet (trozet@redhat.com)
 
 # Use default if no param passed
-CONFIG=${1-"/var/opt/opnfv"}
+CONFIG=${CONFIG:-'/var/opt/opnfv'}
 
 ##LIBRARIES
 source $CONFIG/lib/common-functions.sh
 
 vm_index=4
 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
@@ -39,10 +40,13 @@ for i in $(seq 0 $vm_index); do
   rm -f /var/lib/libvirt/images/baremetal${i}.qcow2 2> /dev/null
 done
 
+for network in ${OPNFV_NETWORK_TYPES}; do
+  virsh net-destroy ${network} 2> /dev/null
+  virsh net-undefine ${network} 2> /dev/null
+done
+
 # Clean off created bridges
 for bridge in ${ovs_bridges}; do
-  virsh net-destroy ${bridge} 2> /dev/null | xargs echo -n
-  virsh net-undefine ${bridge} 2> /dev/null | xargs echo -n
   if detach_interface_from_ovs ${bridge} 2> /dev/null; then
     ovs-vsctl del-br ${bridge} 2> /dev/null
   fi
@@ -53,7 +57,7 @@ sed -i '/stack@undercloud.localdomain/d' /root/.ssh/authorized_keys
 sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
 
 
-# restart libvirtd to force storage cleanup
-systemctl restart libvirtd
+# force storage cleanup
+virsh pool-refresh default
 
 echo "Cleanup Completed"