| commit | 460f6e242b2c393607ac2447f6fa48d30a79dfad | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Aug 03 20:29:26 2016 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Aug 03 20:29:26 2016 +0000 |
| tree | 1d64d486efa65f1336b5b1436d6cb6ba0663ac52 | |
| parent | e56318f9bc87b0ed0e1ce6fcd1216aebe3689fe8 [diff] | |
| parent | 9124a84a968d00582bd8bada154db22b9544bfd0 [diff] |
Merge "q-l3 failed to start in case q-fwaas enabled"
diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 5d91cda..44db16a 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy
@@ -292,9 +292,6 @@ function _determine_config_l3 { local opts="--config-file $NEUTRON_CONF --config-file $Q_L3_CONF_FILE" - if is_service_enabled q-fwaas; then - opts+=" --config-file $Q_FWAAS_CONF_FILE" - fi echo "$opts" }