Splitting out overcloud functions to lib files

[apex.git] / ci / clean.sh

diff --git a/ci/clean.sh b/ci/clean.sh
index 40ae6ed..4cf6b64 100755 (executable)
--- a/ci/clean.sh
+++ b/ci/clean.sh
@@ -11,43 +11,50 @@
 #Clean script to uninstall provisioning server for Apex
 #author: Dan Radez (dradez@redhat.com)
 #author: Tim Rozet (trozet@redhat.com)
-CONFIG=/var/opt/opnfv
+
+# Use default if no param passed
+CONFIG=${CONFIG:-'/var/opt/opnfv'}
+RESOURCES=${RESOURCES:-"$CONFIG/images"}
+LIB=${LIB:-"$CONFIG/lib"}
 
 ##LIBRARIES
-source $CONFIG/lib/common-functions.sh
+if ! source $LIB/common-functions.sh; then
+  echo "Failed to source $LIB/common-functions.sh"
+  exit 1
+fi
 
 vm_index=4
 ovs_bridges="br-admin br-private br-public br-storage"
+OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network api_network"
 
 # Clean off instack/undercloud VM
 for vm in instack undercloud; do
-    virsh destroy $vm 2> /dev/null || echo -n ''
-    virsh undefine $vm 2> /dev/null || echo -n ''
-    if ! virsh vol-delete ${vm}.qcow2 --pool default 2> /dev/null; then
-        if [ ! -e /var/lib/libvirt/images/${vm}.qcow2 ]; then
-        /usr/bin/touch /var/lib/libvirt/images/${vm}.qcow2
-        virsh vol-delete ${vm}.qcow2 --pool default
-        fi
-    fi
+  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
 
-rm -f /var/lib/libvirt/images/undercloud.qcow2 2> /dev/null
-
 # Clean off baremetal VMs in case they exist
 for i in $(seq 0 $vm_index); do
-  virsh destroy baremetal$i 2> /dev/null || echo -n ''
-  virsh undefine baremetal$i 2> /dev/null || echo -n ''
+  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
+  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
 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
-  virsh net-undefine ${bridge} 2> /dev/null
   if detach_interface_from_ovs ${bridge} 2> /dev/null; then
     ovs-vsctl del-br ${bridge} 2> /dev/null
+    rm -f /etc/sysconfig/network-scripts/ifcfg-${bridge}
   fi
 done
 
@@ -56,4 +63,10 @@ sed -i '/stack@undercloud.localdomain/d' /root/.ssh/authorized_keys
 sed -i '/virtual-power-key/d' /root/.ssh/authorized_keys
 
 
+# force storage cleanup
+virsh pool-refresh default
+
+# remove temporary files
+rm -f /tmp/network-environment.yaml
+
 echo "Cleanup Completed"