From 479d567177023cdc243cfa14134f152bfefbd52e Mon Sep 17 00:00:00 2001
From: liyingjun <yingjun.li@kylin-cloud.com>
Date: Tue, 16 May 2017 17:21:58 +0800
Subject: [PATCH] Removing ovs bridge before destroying container

Change-Id: I0fac4cef9e961b1d64f269bfc27804e77f4ea842
Closes-bug: #1689422
---
 tools/cleanup-containers | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/cleanup-containers b/tools/cleanup-containers
index a6fee80ea7..62aa34af79 100755
--- a/tools/cleanup-containers
+++ b/tools/cleanup-containers
@@ -26,6 +26,7 @@ echo "Removing ovs bridge..."
 (docker exec -u root neutron_openvswitch_agent neutron-ovs-cleanup \
     --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini \
     --ovs_all_ports) > /dev/null
+(docker exec -it openvswitch_vswitchd bash -c 'for br in `ovs-vsctl list-br`;do ovs-vsctl --if-exists del-br $br;done') > /dev/null
 fi
 
 echo "Stopping containers..."