Browse code

Merge "Always pass $NEUTRON_CONF"

Jenkins authored on 2016/05/19 06:30:51
Showing 1 changed files
... ...
@@ -451,11 +451,7 @@ function stop_neutron_new {
451 451
 # Compile the lost of enabled config files
452 452
 function _set_config_files {
453 453
 
454
-    #TODO(sc68cal) - see if we can clean up this and only
455
-    # pass in config files that make sense for certain agents
456
-    if is_service_enabled neutron-api; then
457
-        NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_CONF"
458
-    fi
454
+    NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_CONF"
459 455
 
460 456
     #TODO(sc68cal) OVS and LB agent uses settings in NEUTRON_PLUGIN_CONF (ml2_conf.ini) but others may not
461 457
     if is_service_enabled neutron-agent; then