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
diff --git a/lib/neutron b/lib/neutron
index e141583..fa2e926 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -451,11 +451,7 @@
# 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