From c2ef7d6804dd935b4c204e47720c6f642dc1c0ee Mon Sep 17 00:00:00 2001 From: Nenad Radojevic Date: Thu, 19 Jan 2017 11:31:58 +0000 Subject: [PATCH] Fix placeholder for 'service_auth' section in neutron_lbaas.conf The [service_auth] section in neutron_lbaas.conf should be set no matter which driver is going to be used for the service provider. Change-Id: I0339f8e5f68135aad4289dcbaed18d6bae24eda9 Closes-Bug: #1657702 --- ansible/roles/neutron/templates/neutron_lbaas.conf.j2 | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 index 2187f4f85e..6dc543dcaf 100644 --- a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 +++ b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 @@ -2,6 +2,9 @@ [service_providers] {% if enable_octavia | bool %} service_provider = LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default +{% else %} +service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default +{% endif %} [service_auth] auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0 @@ -9,8 +12,4 @@ admin_tenant_name = admin admin_user = admin admin_password = {{ keystone_admin_password }} auth_version = 2 -{% else %} -service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default -{% endif %} - {% endif %}