[openstack-neutron/el6-havana] Add vpnaas/fwaas ini files to init scripts

[Terry Wilson]

commit 5262bd67babaf997cf43899ca356b9c107b1ca6f
Author: Terry Wilson <twilson at redhat.com>
Date:   Mon Dec 9 12:12:15 2013 -0600

    Add vpnaas/fwaas ini files to init scripts

 neutron-l3-agent.init     |    1 +
 neutron-l3-agent.upstart  |    2 +-
 neutron-vpn-agent.init    |    1 +
 neutron-vpn-agent.upstart |    2 +-
 openstack-neutron.spec    |    1 +
 5 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/neutron-l3-agent.init b/neutron-l3-agent.init
index 0e241f8..d07f5a4 100644
--- a/neutron-l3-agent.init
+++ b/neutron-l3-agent.init
@@ -16,6 +16,7 @@ configs=(
     "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/l3_agent.ini" \
+    "/etc/$proj/fwaas_driver.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
 
diff --git a/neutron-l3-agent.upstart b/neutron-l3-agent.upstart
index 35e1d32..81b4d47 100644
--- a/neutron-l3-agent.upstart
+++ b/neutron-l3-agent.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" neutron
+exec su -s /bin/sh -c "exec /usr/bin/neutron-l3-agent --log-file /var/log/neutron/l3-agent.log --config-file /usr/share/neutron/neutron-dist.conf --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/l3_agent.ini" --config-file /etc/neutron/fwaas_driver.ini neutron
diff --git a/neutron-vpn-agent.init b/neutron-vpn-agent.init
index 6a5acfe..6140ece 100644
--- a/neutron-vpn-agent.init
+++ b/neutron-vpn-agent.init
@@ -16,6 +16,7 @@ configs=(
     "/usr/share/$proj/$proj-dist.conf" \
     "/etc/$proj/$proj.conf" \
     "/etc/$proj/vpn_agent.ini" \
+    "/etc/$proj/l3_agent.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
 
diff --git a/neutron-vpn-agent.upstart b/neutron-vpn-agent.upstart
index 83c7a2d..94830d7 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" 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" neutron
diff --git a/openstack-neutron.spec b/openstack-neutron.spec
index e2a8013..9382cf1 100644
--- a/openstack-neutron.spec
+++ b/openstack-neutron.spec
@@ -802,6 +802,7 @@ fi
 %attr(-, root, neutron) %{_datadir}/neutron/neutron-dist.conf
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/api-paste.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/dhcp_agent.ini
+%config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/fwaas_driver.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/l3_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/metadata_agent.ini
 %config(noreplace) %attr(0640, root, neutron) %{_sysconfdir}/neutron/lbaas_agent.ini