Browse code
q-l3 failed to start in case q-fwaas enabled
In case q-fwaas is enabled. It will causes the q-l3 failed to start
because the DevStack gave a redundant --config-file option to start q-l3
This is a follow-up patch of 84409516d56417464dfe0c4e6904a1a76f9fa254
to remove fwaas from DevStack completely.
Change-Id: I630969b3556bcffba506cab02a09cc83f4430c88
Closes-Bug: #1608401
Cao Xuan Hoang authored on 2016/08/01 16:56:02Showing 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 |
|