Fix a problem with openvswitch-agent where it's config file was not being loaded.

Rewritten-From: a03cf5134f84bb5c276aa423073bf9faaa7f36fb

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 1620ec7cd4eb3a41d7c8af965ee1a676c6b5734c..4d00d926d3598e69bdf250524bed1b03e861a2ff 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,11 @@
+neutron (2015.1.0-2) UNRELEASED; urgency=medium
+
+  [ gustavo panizzo ]
+  * Fix a problem with openvswitch-agent where it's config file was not being
+    loaded.
+
+ -- gustavo panizzo <gfa@zumbi.com.ar>  Wed, 06 May 2015 14:28:36 +0800
+
 neutron (2015.1.0-1) unstable; urgency=medium
 
   * New upstream release.

diff --git a/trusty/debian/neutron-openvswitch-agent.init.in b/trusty/debian/neutron-openvswitch-agent.init.in
index 40f9954baf16cc2015c0b35ca56ed3a4429d10ea..53c815414bc9fbf6c34d40408256b23310a966b1 100644 (file)
--- a/trusty/debian/neutron-openvswitch-agent.init.in
+++ b/trusty/debian/neutron-openvswitch-agent.init.in
@@ -16,9 +16,9 @@
 DESC="Openstack Neutron OpenVSwitch Plugin Agent"
 PROJECT_NAME=neutron
 NAME=${PROJECT_NAME}-openvswitch-agent
-CONF_FILE=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
+CONFIG_FILE=/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
 
 # Since Juno OVS plugin as been deprecated as core_plugin, it has been
 # replaced by ml2 as core_plugin and ovs as agent. Making ml2 mandatory
 # to use this agent
-DAEMON_ARGS="--config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"
+DAEMON_ARGS="--config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini"