Browse code

Merge "q-l3 failed to start in case q-fwaas enabled"

Jenkins authored on 2016/08/04 05:29:26
Showing 1 changed files
... ...
@@ -292,9 +292,6 @@ function _determine_config_server {
292 292
 
293 293
 function _determine_config_l3 {
294 294
     local opts="--config-file $NEUTRON_CONF --config-file $Q_L3_CONF_FILE"
295
-    if is_service_enabled q-fwaas; then
296
-        opts+=" --config-file $Q_FWAAS_CONF_FILE"
297
-    fi
298 295
     echo "$opts"
299 296
 }
300 297