From 431a2a096da22ad1534016430bb93bdb9147ed85 Mon Sep 17 00:00:00 2001
From: Nenad Radojevic <nradojevic@evoila.de>
Date: Wed, 25 Jan 2017 11:53:26 +0000
Subject: [PATCH] Use neutron user in neutron_lbaas.conf and overwrite defaults

Lbaas should make a call to Barbican with the neutron-service-user.
Moreover, it is needed to set up the region as well as
endpoint_type in order to overwrite the defaults.

Change-Id: I13105d092cb4397db1bc6481c5ca6677b4d4c048
Closes-Bug: #1659249
---
 ansible/roles/neutron/templates/neutron_lbaas.conf.j2 | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2 b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2
index 6dc543dcaf..98c9045c87 100644
--- a/ansible/roles/neutron/templates/neutron_lbaas.conf.j2
+++ b/ansible/roles/neutron/templates/neutron_lbaas.conf.j2
@@ -8,8 +8,10 @@ service_provider = LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_d
 
 [service_auth]
 auth_url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v2.0
-admin_tenant_name = admin
-admin_user = admin
-admin_password = {{ keystone_admin_password }}
+admin_tenant_name = service
+admin_user = neutron
+admin_password = {{ neutron_keystone_password }}
 auth_version = 2
+region = {{ openstack_region_name }}
+endpoint_type = internal
 {% endif %}