Browse code
Remove duplication in ml2 and openvswitch_agent
Configuration of local_ip is duplication in ml2 because there is
the configuration in both ml2 and openvswitch_agent.
It also should be set in each driver using openvswitch.
Change-Id: Ib0b874aed8db883d778426ed1ae01679fc0cc075
Hirofumi Ichihara authored on 2015/07/04 20:45:24Showing 1 changed files
| 1 | 1 |
old mode 100644 |
| 2 | 2 |
new mode 100755 |
| ... | ... |
@@ -107,11 +107,6 @@ function neutron_plugin_configure_service {
|
| 107 | 107 |
iniset /$Q_PLUGIN_CONF_FILE securitygroup firewall_driver neutron.agent.firewall.NoopFirewallDriver |
| 108 | 108 |
fi |
| 109 | 109 |
|
| 110 |
- if [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then |
|
| 111 |
- # Set local_ip if TENANT_TUNNELS are enabled. |
|
| 112 |
- iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $TUNNEL_ENDPOINT_IP |
|
| 113 |
- fi |
|
| 114 |
- |
|
| 115 | 110 |
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS |
| 116 | 111 |
|
| 117 | 112 |
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS |