diff options
author | Dan Radez <dradez@redhat.com> | 2016-01-13 11:43:52 -0500 |
---|---|---|
committer | Dan Radez <dradez@redhat.com> | 2016-01-13 11:53:19 -0500 |
commit | b08e3323c00bf216730ed44c729562ffa1f57ac9 (patch) | |
tree | 779018c03fe0ae71a0c211d8bd6b26d4b2d77b6c /ci/clean.sh | |
parent | e5bb2981e1c467938a65668e4ebe5a3371e6289e (diff) |
quick fixes to deploy and clean
- adding a missing exit 1 in the deploy script
- setting link up on hypervisor bridges
- redirecting error from cleanup commands so they're not so chatty
Change-Id: I844c35effb2817948ea096b07a34d83678803e00
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 45486de0..8125ec30 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -13,7 +13,7 @@ ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM virsh destroy instack 2> /dev/null || echo -n '' virsh undefine instack --remove-all-storage 2> /dev/null || echo -n '' -if ! virsh vol-delete instack.qcow2 --pool default; then +if ! virsh vol-delete instack.qcow2 --pool default 2> /dev/null; then if [ ! -e /var/lib/libvirt/images/instack.qcow2 ]; then /usr/bin/touch /var/lib/libvirt/images/instack.qcow2 virsh vol-delete instack.qcow2 --pool default @@ -34,7 +34,7 @@ done 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}; then + if detach_interface_from_ovs ${bridge} 2> /dev/null; then ovs-vsctl del-br ${bridge} 2> /dev/null fi done |