From 73ae3482ce09b5b561a783ebfd31187b879c6f67 Mon Sep 17 00:00:00 2001
From: Feng Pan <fpan@redhat.com>
Date: Sun, 22 May 2016 23:42:34 -0400
Subject: 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>
---
 ci/clean.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ci/clean.sh')

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
-- 
cgit 1.2.3-korg