From: gustavo panizzo <gfa@zumbi.com.ar>
Date: Wed, 2 Apr 2014 05:07:26 +0000 (-0300)
Subject: Fixes an issue using ml2 and openvswitch plugin
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=72597e0f9132c31ddf392ebdb54b251dab898553;p=openstack-build%2Fneutron-build.git

Fixes an issue using ml2 and openvswitch plugin

Rewritten-From: b737899a2cdf29398861e16c1f78f4707d5388f2
---

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index f83f25a34..75a6670cd 100644
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,10 @@
+neutron (2014.1~rc1-3) UNRELEASED; urgency=medium
+
+  * Fixes an issue using ml2 and openvswitch plugin, openvswitch agent wasn't 
+  loading it's config file.
+
+ -- gustavo panizzo <gfa@zumbi.com.ar>  Wed, 02 Apr 2014 02:06:05 -0300
+
 neutron (2014.1~rc1-2) experimental; urgency=low
 
   * New upstream release.
diff --git a/trusty/debian/neutron-plugin-openvswitch-agent.init b/trusty/debian/neutron-plugin-openvswitch-agent.init
index 96b2751d2..a86f49889 100644
--- a/trusty/debian/neutron-plugin-openvswitch-agent.init
+++ b/trusty/debian/neutron-plugin-openvswitch-agent.init
@@ -47,6 +47,9 @@ if [ -z "${CURRENT_PLUGIN}" ] ; then
 fi
 neutron_core_plugin_to_plugin_name ${CURRENT_PLUGIN}
 neutron_plugin_ini_path ${NEUTRON_PLUGIN_NAME}
+if [ ${NEUTRON_PLUGIN_NAME} = ml2 ]; then
+            DAEMON_ARGS="${DAEMON_ARGS} --config-file=${CONF_FILE}"
+fi
 if [ -z "${NEUTRON_PLUGIN_CONFIG}" ] ; then
 	echo "Plugin not recognized: please edit /etc/init.d/neutron-server to select the correct .ini file to load for your plugin"
 else