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

[Ihar Hrachyshka]

commit b25ffb743c364ef4a2a2f9c71c92506f64bff196
Author: Ihar Hrachyshka <ihrachys at redhat.com>
Date:   Thu May 15 14:43:21 2014 +0200

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

 neutron-vpn-agent.service |    2 +-
 openstack-neutron.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/neutron-vpn-agent.service b/neutron-vpn-agent.service
index 8fcf302..85f0e81 100644
--- a/neutron-vpn-agent.service
+++ b/neutron-vpn-agent.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=neutron
-ExecStart=/usr/bin/neutron-vpn-agent --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 --log-file /var/log/neutron/vpn-agent.log
+ExecStart=/usr/bin/neutron-vpn-agent --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 --log-file /var/log/neutron/vpn-agent.log
 PrivateTmp=false
 
 [Install]
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index ba58956..0cef083 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -2,7 +2,7 @@
 
 Name:		openstack-neutron
 Version:	2013.2.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Provides:	openstack-quantum = %{version}-%{release}
 Obsoletes:	openstack-quantum < 2013.2-0.4.b3
 Summary:	OpenStack Networking Service
@@ -922,6 +922,9 @@ fi
 
 
 %changelog
+* Thu May 15 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-5
+- Make neutron-vpn-agent read fwaas_driver.ini, bz#1098121
+
 * Mon Apr 28 2014 Ihar Hrachyshka <ihrachys at redhat.com> 2013.2.3-4
 - Removed signing_dir from neutron.conf (bz#1050842)
 - Sync service and systemd modules from oslo-incubator (bz#1063427)