[openstack-neutron/el6-icehouse] Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121

[Ihar Hrachyshka]

commit 55b1e4f23fa8ff84409063de721ef1b6b84f186c
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Thu May 15 14:45:28 2014 +0200

    Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121

 neutron-vpn-agent.init    |    1 +
 neutron-vpn-agent.upstart |    2 +-
 openstack-neutron.spec    |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/neutron-vpn-agent.init b/neutron-vpn-agent.init
index 6140ece..feb4af5 100644
--- a/neutron-vpn-agent.init
+++ b/neutron-vpn-agent.init
@@ -17,6 +17,7 @@ configs=(
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/vpn_agent.ini" \
     "/etc/$proj/l3_agent.ini" \
+    "/etc/$proj/fwaas_driver.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
 
diff --git a/neutron-vpn-agent.upstart b/neutron-vpn-agent.upstart
index 94830d7..d31274d 100644
--- a/neutron-vpn-agent.upstart
+++ b/neutron-vpn-agent.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini --config-file /etc/neutron/l3_agent.ini" neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-vpn-agent --log-file /var/log/neutron/vpn-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/vpn_agent.ini --config-file /etc/neutron/l3_agent.ini --config-file /etc/neutron/fwaas_driver.ini" neutron
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index b011362..9763373 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2014.1
-Release:	14%{?dist}
+Release:	15%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.3.b3
 
@@ -1076,6 +1076,9 @@ fi
 
 
 %changelog
+* Thu May 15 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-15
+- Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121
+
 * Tue Apr 29 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2014.1-14
 - Removed signing_dir from neutron-dist.conf, again (bz#1050842)