diff options
author | Tim Rozet <trozet@redhat.com> | 2016-01-09 18:26:50 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-09 18:26:50 +0000 |
commit | 8a46a78ddd2460358416c3cfec1de86002b0e018 (patch) | |
tree | 5666c36806d7395d61ee3147d050e92b997b3ffe /ci/clean.sh | |
parent | c43b4a2afad26f7b8f58ecfa3cb17304fa94dd8b (diff) | |
parent | 9a11a203fa228cad7a86ebf2cb28ae834d17decd (diff) |
Merge "Fixes attaching instack interfaces to host"
Diffstat (limited to 'ci/clean.sh')
-rwxr-xr-x | ci/clean.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 89e89aa4..45486de0 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -2,7 +2,12 @@ #Clean script to uninstall provisioning server for Apex #author: Dan Radez (dradez@redhat.com) -# +#author: Tim Rozet (trozet@redhat.com) +CONFIG=/var/opt/opnfv + +##LIBRARIES +source $CONFIG/lib/common-functions.sh + vm_index=4 ovs_bridges="brbm brbm1 brbm2 brbm3" # Clean off instack VM @@ -29,7 +34,9 @@ done for bridge in ${ovs_bridges}; do virsh net-destroy ${bridge} 2> /dev/null virsh net-undefine ${bridge} 2> /dev/null - ovs-vsctl del-br ${bridge} 2> /dev/null + if detach_interface_from_ovs ${bridge}; then + ovs-vsctl del-br ${bridge} 2> /dev/null + fi done # clean pub keys from root's auth keys |