commit d48d672a8d36a70b10456496159fecf7551e89f8
author Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp> Sat Jul 04 22:58:44 2015 +0900
committer Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp> Sat Jul 04 22:58:44 2015 +0900
tree ad21c012eedaec74bfcb3dbfb7122e1e59833c9f
parent 018c50c2e279e73920d71c317fbabfe3a32c9943

Add tunnel_bridge configuration for openvswitch agent

Change-Id: I0235aa05cf86b3ed9d9620dda3f16b69ced077e3

lib/neutron_plugins/openvswitch_agent

diff --git a/lib/neutron_plugins/openvswitch_agent b/lib/neutron_plugins/openvswitch_agent
old mode 100644
new mode 100755
index 2a05e2d..1ff3a40
--- a/lib/neutron_plugins/openvswitch_agent
+++ b/lib/neutron_plugins/openvswitch_agent
@@ -50,6 +50,7 @@
             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

lib/neutron_plugins/ovs_base

diff --git a/lib/neutron_plugins/ovs_base b/lib/neutron_plugins/ovs_base
old mode 100644
new mode 100755
index 4e750f0..ad09a73
--- a/lib/neutron_plugins/ovs_base
+++ b/lib/neutron_plugins/ovs_base
@@ -9,6 +9,7 @@
 
 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.