openstack/devstack
Code Issues Proposed changes

Merge "Set local_ip only when TENANT_TUNNELS are enabled"

Browse Source
This commit is contained in:
Jenkins 2015-05-06 17:34:53 +00:00 committed by Gerrit Code Review
commit 872cdf62ce
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/neutron_plugins/ml2
View File

@ -104,8 +104,10 @@ function neutron_plugin_configure_service {
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver
fi fi
# Since we enable the tunnel TypeDrivers, also enable a local_ip if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP # 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 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS