openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix wrong heat trustee configuration"

Browse Source
This commit is contained in:
Jenkins 2016-09-29 15:39:05 +00:00 committed by Gerrit Code Review
commit 4ca9b5111f
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/heat/templates/heat.conf.j2
View File

@ -66,9 +66,7 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }} auth_url = {{ admin_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_admin_port }}
{% endif %} {% endif %}
auth_plugin = password auth_plugin = password
project_domain_id = default
user_domain_id = default user_domain_id = default
project_name = service
username = {{ heat_keystone_user }} username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }} password = {{ heat_keystone_password }}