From: Thomas Goirand <zigo@debian.org>
Date: Thu, 23 Jun 2016 12:16:54 +0000 (+0200)
Subject: neutron-server loads fwaas_driver.ini if it is present in /etc/neutron.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e8fb00a3554387162a4219b289f8a07e3aee3146;p=openstack-build%2Fneutron-build.git

neutron-server loads fwaas_driver.ini if it is present in /etc/neutron.

Rewritten-From: 3461c78d08a892d8b40258792001eba7bfb1f047
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 48440f35b..0533fdaf4 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,6 +1,7 @@
 neutron (2:9.0.0~b1-2) UNRELEASED; urgency=medium
 
   * Activates qos policies by default.
+  * neutron-server loads fwaas_driver.ini if it is present in /etc/neutron.
 
  -- Thomas Goirand <zigo@debian.org>  Fri, 17 Jun 2016 14:33:59 +0200
 
diff --git a/xenial/debian/neutron-server.init.in b/xenial/debian/neutron-server.init.in
index ce6b27be5..819f38bd9 100644
--- a/xenial/debian/neutron-server.init.in
+++ b/xenial/debian/neutron-server.init.in
@@ -40,6 +40,11 @@ else
 	DESC="${DESC} with ${NEUTRON_PLUGIN_NAME} plugin"
 fi
 
+# If neutron-fwaas-l3-agent is installed, then we want to activate fwaas
+if [ -r /etc/neutron/fwaas_driver.ini ] ; then
+	DAEMON_ARGS="${DAEMON_ARGS} --config-file=/etc/neutron/fwaas_driver.ini"
+fi
+
 ### Neutron folders creation ###
 mkdir -p /var/lib/neutron/tmp
 chown neutron:neutron /var/lib/neutron/tmp