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
This commit is contained in:
parent
018c50c2e2
commit
4f91f93557
5
lib/neutron_plugins/ml2
Normal file → Executable file
5
lib/neutron_plugins/ml2
Normal file → Executable 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
|
||||
|
Loading…
Reference in New Issue
Block a user