openstack/devstack
Code Issues Proposed changes

Merge "lib/neutron: Fix conf handling"

Browse Source
This commit is contained in:
Jenkins
2017-03-01 09:29:41 +00:00
committed by Gerrit Code Review
parent 192046e4ab ed887d8b9f
commit 2977d9aef5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/neutron
View File

@@ -395,9 +395,9 @@ function start_neutron_api {
service_protocol="http"
fi
local opts = ""
opts+="--config-file $NEUTRON_CONF"
opts+="--config-file $NEUTRON_CORE_PLUGIN_CONF"
local opts=""
opts+=" --config-file $NEUTRON_CONF"
opts+=" --config-file $NEUTRON_CORE_PLUGIN_CONF"
local cfg_file
for cfg_file in ${_NEUTRON_SERVER_EXTRA_CONF_FILES_ABS[@]}; do
opts+=" --config-file $cfg_file"
@@ -405,7 +405,7 @@ function start_neutron_api {
# Start the Neutron service
# TODO(sc68cal) Stop hard coding this
run_process neutron-api "$NEUTRON_BIN_DIR/neutron-server $ops"
run_process neutron-api "$NEUTRON_BIN_DIR/neutron-server $opts"
if is_ssl_enabled_service "neutron"; then
ssl_ca="--ca-certificate=${SSL_BUNDLE_FILE}"