openstack/devstack
Code Issues Proposed changes

Merge "Remove duplication in ml2 and openvswitch_agent"

Browse Source
This commit is contained in:
Jenkins 2015-07-07 23:15:31 +00:00 committed by Gerrit Code Review
commit 7eaaba4844
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron_plugins/ml2 Normal file → Executable file
View File

@ -107,11 +107,6 @@ function neutron_plugin_configure_service {
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
fi
if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
# Set local_ip if TENANT_TUNNELS are enabled.
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP
fi
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS