openstack/devstack
Code Issues Proposed changes

Merge "Fix tunneling support for linuxbridge-agent"

Browse Source
This commit is contained in:
Jenkins 2015-10-01 01:28:01 +00:00 committed by Gerrit Code Review
commit ace1e8f9b4
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/neutron_plugins/linuxbridge_agent
View File

@ -69,6 +69,18 @@ function neutron_plugin_configure_plugin_agent {
fi fi
AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent" AGENT_BINARY="$NEUTRON_BIN_DIR/neutron-linuxbridge-agent"
iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES iniset /$Q_PLUGIN_CONF_FILE agent tunnel_types $Q_TUNNEL_TYPES
# Configure vxlan tunneling
if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" == "vxlan" ]]; then
iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "True"
iniset /$Q_PLUGIN_CONF_FILE vxlan local_ip $TUNNEL_ENDPOINT_IP
else
iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "False"
fi
else
iniset /$Q_PLUGIN_CONF_FILE vxlan enable_vxlan "False"
fi
} }
function neutron_plugin_setup_interface_driver { function neutron_plugin_setup_interface_driver {