commit 4f91f93557d088b315e1687db9fa462888a06312
author Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp> Sat Jul 04 20:45:24 2015 +0900
committer Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp> Sat Jul 04 20:45:24 2015 +0900
tree 201356a73a28259ed90c17b5fa2f891c5d3cbf07
parent 018c50c2e279e73920d71c317fbabfe3a32c9943

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

lib/neutron_plugins/ml2

diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
old mode 100644
new mode 100755
index 2733f1f..13ffee9
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -107,11 +107,6 @@
         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