From 78b89278740ab551e9ba62e5c5565f092b480634 Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Mon, 19 Feb 2018 16:52:35 +0300
Subject: [PATCH] Fix murano authentication configuration options

Murano failed to deploy due to outdated options - it tried to
issue v2.0 Keystone requests instead of v3. With new options that
are similar to other projects deployment succeeds.

Change-Id: I1970641e47fa6f94c2c6427ef49b3160d64c33ed
Closes-Bug: #1750373
---
 ansible/roles/murano/templates/murano.conf.j2 | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ansible/roles/murano/templates/murano.conf.j2 b/ansible/roles/murano/templates/murano.conf.j2
index 6e3c4441e3..0890fc4ba0 100644
--- a/ansible/roles/murano/templates/murano.conf.j2
+++ b/ansible/roles/murano/templates/murano.conf.j2
@@ -17,17 +17,15 @@ engine_workers = {{ openstack_service_workers }}
 connection = mysql+pymysql://{{ murano_database_user }}:{{ murano_database_password }}@{{ murano_database_address }}/{{ murano_database_name }}
 max_retries = -1
 
-[keystone]
-auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
-
 [keystone_authtoken]
 auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
-auth_host = {{ kolla_internal_fqdn }}
-auth_port = {{ keystone_public_port }}
-auth_protocol = {{ internal_protocol }}
-admin_tenant_name = service
-admin_user = {{ murano_keystone_user }}
-admin_password = {{ murano_keystone_password }}
+auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
+auth_type = password
+project_domain_id = {{ default_project_domain_id }}
+user_domain_id = {{ default_user_domain_id }}
+project_name = service
+username = {{ murano_keystone_user }}
+password = {{ murano_keystone_password }}
 
 memcache_security_strategy = ENCRYPT
 memcache_secret_key = {{ memcache_secret_key }}