Merge "Fix placeholder for 'service_auth' section in neutron_lbaas.conf"

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 %}