openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Make LBaaSv2 service_provider configurable

Browse Source 
This patch makes the service_provider line for LBaaSv2 configurable.
When Octavia is ready, this should allow for a fairly easy switch
from LBaaSv2 with an agent to Octavia.

Change-Id: I4a185406b26d30b383c08d39612138d52f88e60b
This commit is contained in:
Major Hayden 2016-07-21 15:52:22 -05:00
parent 13b41a3b54
commit 5b44c5b00b
No known key found for this signature in database
GPG Key ID: 737051E0C1011FB1
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -227,6 +227,8 @@ neutron_metadata: "{% if neutron_plugin_type.split('.')[0] == 'ml2' and (neutron
# is required.
neutron_lbaasv2: "{% if 'neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' in neutron_plugin_base %}True{% else %}False{% endif %}"
neutron_lbaasv2_device_driver: neutron_lbaas.drivers.haproxy.namespace_driver.HaproxyNSDriver
neutron_lbaasv2_service_provider: LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
## Neutron L3
## Please add 'router' to the neutron_plugin_base list
#TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle

5
releasenotes/notes/lbaasv2-service-provider-config-57d394bdc64f632e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- The LBaaSv2 service provider configuration can now be adjusted with the
``neutron_lbaasv2_service_provider`` variable. This allows a deployer to
choose to deploy LBaaSv2 with Octavia in a future version.

2
templates/neutron.conf.j2
View File

@ -156,7 +156,7 @@ pool_timeout = {{ neutron_db_pool_timeout }}
# Service providers
[service_providers]
{% if neutron_lbaasv2 | bool %}
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
service_provider = {{ neutron_lbaasv2_service_provider }}
{% endif %}
{% if neutron_vpnaas| bool %}
service_provider = VPN:openswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default