diff options
author | Tim Rozet <trozet@redhat.com> | 2015-12-15 17:35:30 -0500 |
---|---|---|
committer | Tim Rozet <trozet@redhat.com> | 2015-12-15 17:35:30 -0500 |
commit | 616fba032830d0b00bfc73ecffb13dffe2794a17 (patch) | |
tree | cb133988248c95e8d4d1da694efaa4b3d59a6d50 /ci/clean.sh | |
parent | c2ceba8a6e2092866a6457a3517964fd4822fb21 (diff) |
Fixes various corner cases with clean and deploy
Fixes Include:
- Fixed info print statement when using flat network
- deploy now looks at arp table as well to determine instack IP address
as default leases file may not exist
- clean now uses --pool with vol-delete command
JIRA: APEX-50
Change-Id: I664fd06e92e0890e0b65191851dfa81f8d8ac492
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci/clean.sh')
-rwxr-xr-x | ci/clean.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index b8be179d..2b488804 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -8,14 +8,14 @@ vm_index=4 # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' -virsh vol-delete instack.qcow2 default 2> /dev/null +virsh vol-delete instack.qcow2 --pool default 2> /dev/null rm -f /var/lib/libvirt/images/instack.qcow2 2> /dev/null # Clean off baremetal VMs in case they exist for i in $(seq 0 $vm_index); do virsh destroy baremetalbrbm_brbm1_$i 2> /dev/null || echo -n '' virsh undefine baremetalbrbm_brbm1_$i --remove-all-storage 2> /dev/null || echo -n '' - virsh vol-delete baremetalbrbm_brbm1_${i}.qcow2 default 2> /dev/null + virsh vol-delete baremetalbrbm_brbm1_${i}.qcow2 --pool default 2> /dev/null rm -f /var/lib/libvirt/images/baremetalbrbm_brbm1_${i}.qcow2 2> /dev/null done |