Browse code

Merge "lib/neutron: Fix conf handling"

Jenkins authored on 2017/03/01 18:29:41
Showing 1 changed files
... ...
@@ -395,9 +395,9 @@ function start_neutron_api {
395 395
         service_protocol="http"
396 396
     fi
397 397
 
398
-    local opts = ""
399
-    opts+="--config-file $NEUTRON_CONF"
400
-    opts+="--config-file $NEUTRON_CORE_PLUGIN_CONF"
398
+    local opts=""
399
+    opts+=" --config-file $NEUTRON_CONF"
400
+    opts+=" --config-file $NEUTRON_CORE_PLUGIN_CONF"
401 401
     local cfg_file
402 402
     for cfg_file in ${_NEUTRON_SERVER_EXTRA_CONF_FILES_ABS[@]}; do
403 403
         opts+=" --config-file $cfg_file"
... ...
@@ -405,7 +405,7 @@ function start_neutron_api {
405 405
 
406 406
     # Start the Neutron service
407 407
     # TODO(sc68cal) Stop hard coding this
408
-    run_process neutron-api "$NEUTRON_BIN_DIR/neutron-server $ops"
408
+    run_process neutron-api "$NEUTRON_BIN_DIR/neutron-server $opts"
409 409
 
410 410
     if is_ssl_enabled_service "neutron"; then
411 411
         ssl_ca="--ca-certificate=${SSL_BUNDLE_FILE}"