diff options
Diffstat (limited to 'ci/clean.sh')
| -rwxr-xr-x | ci/clean.sh | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 40ae6edd..2a91b7ce 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -11,7 +11,9 @@ #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=${1-"/var/opt/opnfv"} ##LIBRARIES source $CONFIG/lib/common-functions.sh @@ -21,31 +23,26 @@ ovs_bridges="br-admin br-private br-public br-storage" # 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 # Clean off created bridges for bridge in ${ovs_bridges}; do - virsh net-destroy ${bridge} 2> /dev/null - virsh net-undefine ${bridge} 2> /dev/null + 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 |