From a03cf5134f84bb5c276aa423073bf9faaa7f36fb Mon Sep 17 00:00:00 2001 From: gustavo panizzo Date: Wed, 6 May 2015 14:37:44 +0800 Subject: [PATCH] Fix a problem with openvswitch-agent where it's config file was not being loaded. --- debian/changelog | 8 ++++++++ debian/neutron-openvswitch-agent.init.in | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1620ec7cd..4d00d926d 100644 --- a/debian/changelog +++ b/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 Wed, 06 May 2015 14:28:36 +0800 + neutron (2015.1.0-1) unstable; urgency=medium * New upstream release. diff --git a/debian/neutron-openvswitch-agent.init.in b/debian/neutron-openvswitch-agent.init.in index 40f9954ba..53c815414 100644 --- a/debian/neutron-openvswitch-agent.init.in +++ b/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" -- 2.45.2