Browse code

Merge "Also pass FWAAS conf to VPN agent if enabled"

Jenkins authored on 2014/04/25 08:15:39
Showing 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"