From 49c18cfa74f4c8b6333658c6b1a48f855c636f0e Mon Sep 17 00:00:00 2001 From: gustavo panizzo Date: Wed, 2 Apr 2014 02:07:26 -0300 Subject: [PATCH] Fixes an issue using ml2 and openvswitch plugin Rewritten-From: b737899a2cdf29398861e16c1f78f4707d5388f2 --- xenial/debian/changelog | 7 +++++++ xenial/debian/neutron-plugin-openvswitch-agent.init | 3 +++ 2 files changed, 10 insertions(+) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index f83f25a34..75a6670cd 100644 --- a/xenial/debian/changelog +++ b/xenial/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 Wed, 02 Apr 2014 02:06:05 -0300 + neutron (2014.1~rc1-2) experimental; urgency=low * New upstream release. diff --git a/xenial/debian/neutron-plugin-openvswitch-agent.init b/xenial/debian/neutron-plugin-openvswitch-agent.init index 96b2751d2..a86f49889 100644 --- a/xenial/debian/neutron-plugin-openvswitch-agent.init +++ b/xenial/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 -- 2.45.2