Merge "LBaaS V2 service not needed with Octavia driver" into stable/liberty

This commit is contained in:
Jenkins 2016-02-02 18:39:01 +00:00 committed by Gerrit Code Review
commit ab8c9925e5
3 changed files with 24 additions and 4 deletions

View File

@ -4,6 +4,15 @@ you will need to enable the neutron-lbaas devstack plugin and enable
the LBaaS service by editing the [[local|localrc]] section of your
local.conf file.
Octavia is the LBaaS V2 reference service provider and is used in the
examples below. Enabling another service provider, such as the Haproxy,
is also supported. This can be done by enabling the driver plugin, if
applicable, and setting the appropriate service provider value for
NEUTRON_LBAAS_SERVICE_PROVIDERV2. In addition, you can enable multiple
service providers by enabling the applicable driver plugins and
space-delimiting the service provider values in
NEUTRON_LBAAS_SERVICE_PROVIDERV2.
1) Enable the plugins
To enable the plugin, add a line of the form:
@ -21,7 +30,7 @@ where
For example
enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas stable/liberty
enable_plugin octavia https://git.openstack.org/openstack/octavia stable/liberty
enable_plugin octavia https://git.openstack.org/openstack/octavia 0.5.2
2) Enable the LBaaS services

View File

@ -70,15 +70,24 @@ function neutron_lbaas_configure_agent {
}
function neutron_lbaas_start {
local is_run_process=True
if is_service_enabled $LBAAS_V1; then
LBAAS_VERSION="q-lbaas"
AGENT_LBAAS_BINARY=${AGENT_LBAASV1_BINARY}
else
elif is_service_enabled $LBAAS_V2; then
LBAAS_VERSION="q-lbaasv2"
AGENT_LBAAS_BINARY=${AGENT_LBAASV2_BINARY}
# Octavia doesn't need the LBaaS V2 service running. If Octavia is the
# only provider then don't run the process.
if [[ "$NEUTRON_LBAAS_SERVICE_PROVIDERV2" == "$NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA" ]]; then
is_run_process=False
fi
fi
run_process $LBAAS_VERSION "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file $NEUTRON_LBAAS_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
if [[ "$is_run_process" == "True" ]] ; then
run_process $LBAAS_VERSION "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file $NEUTRON_LBAAS_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
fi
}
function neutron_lbaas_stop {

View File

@ -27,5 +27,7 @@ LBAASV2_PLUGIN=${LBAASV2_PLUGIN:-"neutron_lbaas.services.loadbalancer.plugin.Loa
NEUTRON_LBAAS_DIR=$DEST/neutron-lbaas
NEUTRON_LBAAS_CONF=$NEUTRON_CONF_DIR/neutron_lbaas.conf
NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA=${NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"}
NEUTRON_LBAAS_SERVICE_PROVIDERV1=${NEUTRON_LBAAS_SERVICE_PROVIDERV1:-"LOADBALANCER:Haproxy:neutron_lbaas.services.loadbalancer.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default"}
NEUTRON_LBAAS_SERVICE_PROVIDERV2=${NEUTRON_LBAAS_SERVICE_PROVIDERV2:-"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default"}
NEUTRON_LBAAS_SERVICE_PROVIDERV2=${NEUTRON_LBAAS_SERVICE_PROVIDERV2:-${NEUTRON_LBAAS_SERVICE_PROVIDERV2_OCTAVIA}}