diff --git a/defaults/main.yml b/defaults/main.yml index f599dd78..887044fa 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -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 diff --git a/releasenotes/notes/lbaasv2-service-provider-config-57d394bdc64f632e.yaml b/releasenotes/notes/lbaasv2-service-provider-config-57d394bdc64f632e.yaml new file mode 100644 index 00000000..e87be90b --- /dev/null +++ b/releasenotes/notes/lbaasv2-service-provider-config-57d394bdc64f632e.yaml @@ -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. diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2 index 7d6db8e1..1d97c2ba 100644 --- a/templates/neutron.conf.j2 +++ b/templates/neutron.conf.j2 @@ -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