openstack
/
neutron-lbaas
Code Issues Proposed changes

Adds neutron_lbaas.conf and services_lbaas.conf to q-svc command line 

When q-lbaasv2 is enabled in local.conf, the neutron-lbaas plugin.sh
script creates new services_lbaas.conf and neutron_lbaas.conf files
with some config parameters.

Under several circumstances, some of the options in those files are
needed by other neutron daemons, such as the q-svc service.

This patch modifies the neutron-lbaas devstack plugin to include the
above mentioned config files in q-svc command line, by adding those
files to Q_PLUGIN_EXTRA_CONF_FILES.

Since both config files are shipped in neutron-lbaas, both should be
included. Starting from Ocata, The service provider option won't
automatically load to q-svc, so that is another good incentive to have
it passed with --config-file.

Closes-Bug: #1619466
Related-Bug: #1565511

Change-Id: I652ab029b7427c8783e4b2f0443a89ee884bf064
This commit is contained in:
Nir Magnezi 2016-09-07 07:12:27 -04:00
parent 547f668c23
commit 7cd3443305
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -25,6 +25,7 @@ function neutron_agent_lbaas_install_agent_packages {
function neutron_lbaas_configure_common {
cp $NEUTRON_LBAAS_DIR/etc/neutron_lbaas.conf.sample $NEUTRON_LBAAS_CONF
cp $NEUTRON_LBAAS_DIR/etc/services_lbaas.conf.sample $SERVICES_LBAAS_CONF
inicomment $NEUTRON_LBAAS_CONF service_providers service_provider
iniadd $NEUTRON_LBAAS_CONF service_providers service_provider $NEUTRON_LBAAS_SERVICE_PROVIDERV2

10
devstack/settings
View File

@ -21,7 +21,15 @@ LBAAS_AGENT_CONF_FILENAME=$LBAAS_AGENT_CONF_PATH/lbaas_agent.ini
LBAASV2_PLUGIN=${LBAASV2_PLUGIN:-"neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2"}
NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas
NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/neutron_lbaas.conf
NEUTRON_LBAAS_CONF_FILE=neutron_lbaas.conf
SERVICES_LBAAS_CONF_FILE=services_lbaas.conf
NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/$NEUTRON_LBAAS_CONF_FILE
SERVICES_LBAAS_CONF=$NEUTRON_CONF_DIR/$SERVICES_LBAAS_CONF_FILE
Q_PLUGIN_EXTRA_CONF_PATH=$NEUTRON_CONF_DIR
Q_PLUGIN_EXTRA_CONF_FILES+=($NEUTRON_LBAAS_CONF_FILE $SERVICES_LBAAS_CONF_FILE)
NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA=${NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"}