openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix heat ec2 keystone auth"

Browse Source
This commit is contained in:
Jenkins 2017-06-04 15:03:12 +00:00 committed by Gerrit Code Review
commit 2065e4d059
1 changed files with 2 additions and 2 deletions

4
ansible/roles/heat/templates/heat.conf.j2

@ -76,9 +76,9 @@ password = {{ heat_keystone_password }}
[ec2authtoken]
{% if orchestration_engine == 'KUBERNETES' %}
auth_uri = {{ keystone_internal_url }}
auth_uri = {{ keystone_internal_url }}/v3
{% else %}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}
auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_public_port }}/v3
{% endif %}
[clients_keystone]