Merge "Remove duplicate lbaas provider config"

ebcd7b29 · Jenkins · Gerrit Code Review · bf9e95f3 · 1b04a23d · ebcd7b29
Commit ebcd7b29 authored 8 years ago by Jenkins Committed by Gerrit Code Review 8 years ago
--- a/ansible/roles/neutron/templates/neutron.conf.j2
+++ b/ansible/roles/neutron/templates/neutron.conf.j2
@@ -50,11 +50,6 @@ transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}
 router_distributed = True
 {% endif %}

-{% if enable_neutron_lbaas | bool %}
-[service_providers]
-service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
-{% endif %}
-
 [nova]
 auth_url = {{ keystone_admin_url }}
 auth_type = password