Skip to content

Commit e7d2b56

Browse files
committed
Always pass $NEUTRON_CONF
When running a compute node that only runs n-cpu and neutron-agent, there are still configuration items that are needed by the agent that reside in $NEUTRON_CONF - such as the rabbit rpc information. Change-Id: Ib7f5dde3afb0c19dc88f351c99bc669217952a14
1 parent 7cd7f05 commit e7d2b56

1 file changed

Lines changed: 1 addition & 5 deletions

File tree

lib/neutron

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -451,11 +451,7 @@ function stop_neutron_new {
451451
# Compile the lost of enabled config files
452452
function _set_config_files {
453453

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"
459455

460456
#TODO(sc68cal) OVS and LB agent uses settings in NEUTRON_PLUGIN_CONF (ml2_conf.ini) but others may not
461457
if is_service_enabled neutron-agent; then

0 commit comments

Comments
 (0)