From d48d672a8d36a70b10456496159fecf7551e89f8 Mon Sep 17 00:00:00 2001
From: Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>
Date: Sat, 4 Jul 2015 22:58:44 +0900
Subject: [PATCH] Add tunnel_bridge configuration for openvswitch agent

Change-Id: I0235aa05cf86b3ed9d9620dda3f16b69ced077e3
---
 lib/neutron_plugins/openvswitch_agent | 1 +
 lib/neutron_plugins/ovs_base          | 1 +
 2 files changed, 2 insertions(+)
 mode change 100644 => 100755 lib/neutron_plugins/openvswitch_agent
 mode change 100644 => 100755 lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent
old mode 100644
new mode 100755
index 2a05e2dcfa..1ff3a40c82
--- a/lib/neutron_plugins/openvswitch_agent
+++ b/lib/neutron_plugins/openvswitch_agent
@@ -50,6 +50,7 @@ function neutron_plugin_configure_plugin_agent {
             die $LINENO "You are running OVS version $OVS_VERSION. OVS 1.4+ is required for tunneling between multiple hosts."
         fi
         iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
+        iniset /$Q_PLUGIN_CONF_FILE ovs tunnel_bridge $OVS_TUNNEL_BRIDGE
     fi
 
     # Setup physical network bridge mappings.  Override
diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
old mode 100644
new mode 100755
index 4e750f0932..ad09a739c6
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -9,6 +9,7 @@ set +o xtrace
 
 OVS_BRIDGE=${OVS_BRIDGE:-br-int}
 OVS_DATAPATH_TYPE=${OVS_DATAPATH_TYPE:-""}
+OVS_TUNNEL_BRIDGE=${OVS_TUNNEL_BRIDGE:-br-tun}
 
 function is_neutron_ovs_base_plugin {
     # Yes, we use OVS.