aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorliyingjun <yingjun.li@kylin-cloud.com>2016-09-19 11:49:17 +0800
committerChristian Berendt <berendt@betacloud-solutions.de>2016-09-19 12:50:14 +0000
commit1b04a23d95b5811d669b567d88192e7e240d90da (patch)
tree31e546ee91b006969e148268fdf3450dde55281e /ansible
parentd75847772d0e880329eef5867caf4b87035d2ae0 (diff)
downloadkolla-1b04a23d95b5811d669b567d88192e7e240d90da.tar.gz
kolla-1b04a23d95b5811d669b567d88192e7e240d90da.zip
Remove duplicate lbaas provider config
Option `service_provider` is defined in neutron_lbaas.conf, there is a duplicated config option in neutron.conf, it should be removed there. Otherwise neutron-server will not be able to start with error: 'Invalid: Driver neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver is not unique across providers' Change-Id: I3fc379535eb00bbcb23aa41de95ca8161883a181 Closes-bug: #1625174
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/neutron/templates/neutron.conf.j25
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 99b2a7295..4b788bcc7 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