diff options
author | Feng Pan <fpan@redhat.com> | 2016-05-22 23:42:34 -0400 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2016-05-24 19:52:51 -0400 |
commit | 73ae3482ce09b5b561a783ebfd31187b879c6f67 (patch) | |
tree | 928a4ec8a7eb2560c9e9bebba84802a95eb2a635 /ci/clean.sh | |
parent | 5fec80057dbd799d52a4c1ff2f35a1c8cc5ad6ea (diff) |
Use linux bridge for virtual deployment
Changes virtual deployment to use linux bridge rather than OVS
bridge on jumphost. Also fixed an issue with network deletion
in cleaning code.
Change-Id: Ibcfa283c6bf32aafa2ee91b2ffd55355d7d6746e
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'ci/clean.sh')
-rwxr-xr-x | ci/clean.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ci/clean.sh b/ci/clean.sh index 42090069..368ce8bc 100755 --- a/ci/clean.sh +++ b/ci/clean.sh @@ -20,6 +20,7 @@ source $CONFIG/lib/common-functions.sh vm_index=4 ovs_bridges="br-admin br-private br-public br-storage" +OPNFV_NETWORK_TYPES="admin_network private_network public_network storage_network" # Clean off instack/undercloud VM for vm in instack undercloud; do @@ -39,10 +40,13 @@ for i in $(seq 0 $vm_index); do 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 | 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 |