From 7ab3e39bc485acc2b54d7496a77c2e43eda4e799 Mon Sep 17 00:00:00 2001
From: Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>
Date: Sat, 4 Jul 2015 23:11:52 +0900
Subject: [PATCH] Add cleanup for br-tun with OVS

Change-Id: I5c4d28844f40eaad622ef7590c54e0e6647c85e3
Closes-Bug: #1471390
---
 lib/neutron_plugins/ovs_base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
index ad09a739c6..f1f7f8597b 100755
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -41,7 +41,7 @@ function neutron_ovs_base_cleanup {
     done
 
     # remove all OVS bridges created by Neutron
-    for bridge in $(sudo ovs-vsctl list-br | grep -o -e ${OVS_BRIDGE} -e ${PUBLIC_BRIDGE}); do
+    for bridge in $(sudo ovs-vsctl list-br | grep -o -e ${OVS_BRIDGE} -e ${PUBLIC_BRIDGE} -e ${OVS_TUNNEL_BRIDGE}); do
         sudo ovs-vsctl del-br ${bridge}
     done
 }