openstack/charm-heat
Code Issues Proposed changes

Readd v2.0 for auth_uri

Browse Source
This commit is contained in:
James Page 2016-02-10 14:35:49 +00:00
parent 5276acf9ef
commit fe3b066d81
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/kilo/heat.conf
View File

@ -17,14 +17,14 @@ stack_user_domain_name = heat
{% if auth_host -%} {% if auth_host -%}
[keystone_authtoken] [keystone_authtoken]
identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }} identity_uri = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }} auth_uri = {{ service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
admin_tenant_name = {{ admin_tenant_name }} admin_tenant_name = {{ admin_tenant_name }}
admin_user = {{ admin_user }} admin_user = {{ admin_user }}
admin_password = {{ admin_password }} admin_password = {{ admin_password }}
signing_dir = {{ signing_dir }} signing_dir = {{ signing_dir }}
[ec2_authtoken] [ec2_authtoken]
auth_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }} auth_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0
keystone_ec2_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/ec2tokens keystone_ec2_uri = {{service_protocol }}://{{ service_host }}:{{ service_port }}/v2.0/ec2tokens
{% endif %} {% endif %}