openstack/devstack
Code Issues Proposed changes

Merge "Always pass $NEUTRON_CONF"

Browse Source
This commit is contained in:
Jenkins
2016-05-18 21:30:51 +00:00
committed by Gerrit Code Review
parent 4894ac0d29 e7d2b56391
commit 78289075e1
1 changed files with 1 additions and 5 deletions
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