diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-19 13:48:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-19 13:48:18 +0000 |
| commit | ebcd7b2979800fb9aed6c6b4d10007705c4d1918 (patch) | |
| tree | fc87994930855f5be7f3f0badfbbe5f6f2c4b79f /ansible | |
| parent | bf9e95f3176be9def03aeca176d2489b707543a1 (diff) | |
| parent | 1b04a23d95b5811d669b567d88192e7e240d90da (diff) | |
| download | kolla-ebcd7b2979800fb9aed6c6b4d10007705c4d1918.tar.gz kolla-ebcd7b2979800fb9aed6c6b4d10007705c4d1918.zip | |
Merge "Remove duplicate lbaas provider config"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/neutron/templates/neutron.conf.j2 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ansible/roles/neutron/templates/neutron.conf.j2 b/ansible/roles/neutron/templates/neutron.conf.j2 index 51e6ca2de..6b899ed0c 100644 --- 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 |