Browse code
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
Adam Gandelman authored on 2014/04/22 09:09:52Showing 1 changed files
| ... | ... |
@@ -497,6 +497,7 @@ function start_neutron_agents {
|
| 497 | 497 |
|
| 498 | 498 |
if is_service_enabled q-fwaas; then |
| 499 | 499 |
L3_CONF_FILES="$L3_CONF_FILES --config-file $Q_FWAAS_CONF_FILE" |
| 500 |
+ VPN_CONF_FILES="$VPN_CONF_FILES --config-file $Q_FWAAS_CONF_FILE" |
|
| 500 | 501 |
fi |
| 501 | 502 |
if is_service_enabled q-vpn; then |
| 502 | 503 |
screen_it q-vpn "cd $NEUTRON_DIR && $AGENT_VPN_BINARY $VPN_CONF_FILES" |