From 8d558c8c270c36a78aeb23f16da084508916a89e Mon Sep 17 00:00:00 2001 From: sridhargaddam Date: Mon, 4 May 2015 14:04:16 +0000 Subject: [PATCH] Set local_ip only when TENANT_TUNNELS are enabled In an installation with VLAN tenant networks, devstack should not configure the local_ip (which is applicable only when tenant_tunnels are used). This is causing failures in Neutron for an IPv6 only setup. This patch addresses this issue, but configuring the local_ip only when TENANT_TUNNELS are enabled. Related-Bug: #1447693 Change-Id: I0e2a2d8b6ce0ad87f6c0d318ac522dbab50d44ee --- lib/neutron_plugins/ml2 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2 index abe6ea70f5..88537774b7 100644 --- a/lib/neutron_plugins/ml2 +++ b/lib/neutron_plugins/ml2 @@ -104,8 +104,10 @@ function neutron_plugin_configure_service { iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver fi - # Since we enable the tunnel TypeDrivers, also enable a local_ip - iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP + 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