openstack/devstack
Code Issues Proposed changes

Always pass $NEUTRON_CONF

Browse Source 
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
This commit is contained in:
Sean M. Collins 2016-05-12 12:04:03 -04:00
parent 7cd7f0576b
commit e7d2b56391
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/neutron
View File

@ -451,11 +451,7 @@ function stop_neutron_new {
# Compile the lost of enabled config files
function _set_config_files {
#TODO(sc68cal) - see if we can clean up this and only
# pass in config files that make sense for certain agents
if is_service_enabled neutron-api; then
NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_CONF"
fi
NEUTRON_CONFIG_ARG+=" --config-file $NEUTRON_CONF"
#TODO(sc68cal) OVS and LB agent uses settings in NEUTRON_PLUGIN_CONF (ml2_conf.ini) but others may not
if is_service_enabled neutron-agent; then