From cf1ef23b723f2f859dfcc0302260a13d0f426adb Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Mon, 21 Apr 2014 17:09:52 -0700
Subject: [PATCH] Also pass FWAAS conf to VPN agent if enabled

If q-vpn is enabled, the Neutron neutron-vpn-agent is started
instead of the neutron-l3-agent, but only neutron-l3-agent receives
the fwaas_driver config when q-fwaas is enabled.  This ensures the FW driver
config is passed to either so that a properly configured agent is running
when the FWAAS extensions are enabled.

Closes-bug: #1310858

Change-Id: I237d2831a6b87ae46dfef047d3dc0b85fa6423d3
---
 lib/neutron | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/neutron b/lib/neutron
index 726f676237..9e1e787d64 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -497,6 +497,7 @@ function start_neutron_agents {
 
     if is_service_enabled q-fwaas; then
         L3_CONF_FILES="$L3_CONF_FILES --config-file $Q_FWAAS_CONF_FILE"
+        VPN_CONF_FILES="$VPN_CONF_FILES --config-file $Q_FWAAS_CONF_FILE"
     fi
     if is_service_enabled q-vpn; then
         screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES"