openstack/devstack
Code Issues Proposed changes

Merge "Add tunnel_bridge configuration for openvswitch agent"

Browse Source
This commit is contained in:
Jenkins 2015-07-08 22:46:18 +00:00 committed by Gerrit Code Review
commit 10e6897cee
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/neutron_plugins/openvswitch_agent Normal file → Executable file
View File

@ -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

1
lib/neutron_plugins/ovs_base Normal file → Executable file
View File

@ -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.