openstack/kolla-ansible
Code Issues Proposed changes

Fix placeholder for 'service_auth' section in neutron_lbaas.conf

Browse Source 
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
This commit is contained in:
Nenad Radojevic 2017-01-19 11:31:58 +00:00
parent c108c5e604
commit c2ef7d6804
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/neutron/templates/neutron_lbaas.conf.j2
View File

@ -2,6 +2,9 @@
[service_providers] [service_providers]
{% if enable_octavia | bool %} {% if enable_octavia | bool %}
service_provider = LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default 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] [service_auth]
auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
@ -9,8 +12,4 @@ admin_tenant_name = admin
admin_user = admin admin_user = admin
admin_password = {{ keystone_admin_password }} admin_password = {{ keystone_admin_password }}
auth_version = 2 auth_version = 2
{% else %}
service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:default
{% endif %}
{% endif %} {% endif %}