From 57ba2cd22f5b0ff1c38d0ec3ffdc8ab83b788ba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Maty=C3=A1=C5=A1?= <martinx.maty@intel.com>
Date: Tue, 27 Sep 2016 20:54:43 -0700
Subject: [PATCH] Fix wrong heat trustee configuration
"project_domain_id" and "project_name"
cannot be specified [trustee] section or keystone will throw a
"cannot be scoped to multiple targets" error when we attempt to get
a token scoped to a trust.
Change-Id: I167c0e31835d05b8069fd931ef76fb337dd99207
Closes-Bug: #1628353
---
ansible/roles/heat/templates/heat.conf.j2 | 2 --
1 file changed, 2 deletions(-)
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index fdc624edd7..b2fad08c4a 100644
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -66,9 +66,7 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %}
auth_plugin = password
-project_domain_id = default
user_domain_id = default
-project_name = service
username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }}
--
GitLab