Browse code
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
sridhargaddam authored on 2015/05/04 23:04:16Showing 1 changed files
| ... | ... |
@@ -104,8 +104,10 @@ function neutron_plugin_configure_service {
|
| 104 | 104 |
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver |
| 105 | 105 |
fi |
| 106 | 106 |
|
| 107 |
- # Since we enable the tunnel TypeDrivers, also enable a local_ip |
|
| 108 |
- iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP |
|
| 107 |
+ if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then |
|
| 108 |
+ # Set local_ip if TENANT_TUNNELS are enabled. |
|
| 109 |
+ iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP |
|
| 110 |
+ fi |
|
| 109 | 111 |
|
| 110 | 112 |
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS |
| 111 | 113 |
|