openstack/devstack
Code Issues Proposed changes

Also pass FWAAS conf to VPN agent if enabled

Browse Source 
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
This commit is contained in:
Adam Gandelman 2014-04-21 17:09:52 -07:00
parent b623860c37
commit cf1ef23b72
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/neutron
View File

@ -497,6 +497,7 @@ function start_neutron_agents {
if is_service_enabled q-fwaas; then if is_service_enabled q-fwaas; then
L3_CONF_FILES="$L3_CONF_FILES --config-file $Q_FWAAS_CONF_FILE" 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 fi
if is_service_enabled q-vpn; then if is_service_enabled q-vpn; then
screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES" screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES"