From b439d48ab321f1e30c99e3114bc2ac967f5a1efc Mon Sep 17 00:00:00 2001
From: Nicolas Haller <nicolas@boiteameuh.org>
Date: Wed, 28 Nov 2018 17:04:07 -0500
Subject: [PATCH] Fix section keystone_authtoken of sahara.conf

Tested on Rocky, it seems there is no admin_* variables and some others
are missing (username/password/...) causing keystone to return http code
400 responses.

Change-Id: If4a0919bfcd6b8d8a6bfd5df9001b4967e441e7e
Closes-Bug: #1805714
---
 ansible/roles/sahara/templates/sahara.conf.j2 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2
index 889a00c101..fb2f678e2c 100644
--- a/ansible/roles/sahara/templates/sahara.conf.j2
+++ b/ansible/roles/sahara/templates/sahara.conf.j2
@@ -14,12 +14,13 @@ use_rootwrap = True
 connection = mysql+pymysql://{{ sahara_database_user }}:{{ sahara_database_password }}@{{ sahara_database_address }}/{{ sahara_database_name }}
 
 [keystone_authtoken]
-www_authenticate_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
 auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
 auth_type = password
-admin_user = {{ sahara_keystone_user }}
-admin_password = {{ sahara_keystone_password }}
-admin_tenant_name = service
+user_domain_name = {{ default_project_domain_name }}
+project_name = service
+project_domain_name = {{ default_project_domain_name }}
+username = {{ sahara_keystone_user }}
+password = {{ sahara_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}