openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use option auth_type in group trustee in heat configuration"

Browse Source
This commit is contained in:
Jenkins 2016-10-20 16:10:13 +00:00 committed by Gerrit Code Review
commit 9b7ded1a1c
1 changed files with 1 additions and 1 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

@ -65,7 +65,7 @@ auth_url = {{ keystone_admin_url }}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }} auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
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_type = password
user_domain_id = default user_domain_id = default
username = {{ heat_keystone_user }} username = {{ heat_keystone_user }}
password = {{ heat_keystone_password }} password = {{ heat_keystone_password }}