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
This commit is contained in:
Cao Xuan Hoang 2016-08-01 14:56:02 +07:00
parent d715852753
commit 9124a84a96

View File

@ -292,9 +292,6 @@ function _determine_config_server {
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"
}