aboutsummaryrefslogtreecommitdiff
path: root/ansible
diff options
context:
space:
mode:
authorMartin Matyáš <martinx.maty@intel.com>2016-09-27 20:54:43 -0700
committerMartin Matyáš <martinx.maty@intel.com>2016-09-27 21:04:32 -0700
commit57ba2cd22f5b0ff1c38d0ec3ffdc8ab83b788ba2 (patch)
tree24c7358d3c8e725e4bfb0d70e392e24a3e3e50c4 /ansible
parent622c88ec99c537fec3bd66d913b82ce3462e8a3a (diff)
downloadkolla-57ba2cd22f5b0ff1c38d0ec3ffdc8ab83b788ba2.tar.gz
kolla-57ba2cd22f5b0ff1c38d0ec3ffdc8ab83b788ba2.zip
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
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/heat/templates/heat.conf.j22
1 files changed, 0 insertions, 2 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2
index fdc624edd..b2fad08c4 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 }}