openstack/openstack-ansible
Code Issues Proposed changes

Revert heat's keystone_authtoken configuration

Browse Source 
Commit 6db42a6 updated heat's keystone auth middleware to support
keystone v3, however heat fails to operate with this configuration in
place.  This commit reverts this particular part of commit 6db42a6 to
to restore heat functionality.

Additionally, heat requires auth_uri to contain /v2.0, which is a
non-standard as far as the other projects are concerned.

Change-Id: I52c995e801660e21479a843b4e5410b7e3d349e1
Closes-Bug: #1445402
This commit is contained in:
Matt Thompson
2015-04-20 16:17:07 +01:00
committed by Kevin Carter
parent 7fc8223c2e
commit deaf440546
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
playbooks/roles/os_heat/templates/heat.conf.j2
View File

@@ -38,7 +38,7 @@ endpoint_type = {{ heat_clients_heat_endpoint }}
connection = mysql://{{ heat_galera_user }}:{{ heat_container_mysql_password }}@{{ galera_address }}/{{ heat_galera_database }}?charset=utf8
[ec2authtoken]
auth_uri = {{ keystone_service_internaluri }}
auth_uri = {{ keystone_service_internalurl }}
[heat_api]
bind_port = {{ heat_service_port }}
@@ -63,15 +63,12 @@ trace_sqlalchemy = {{ heat_profiler_trace_sqlalchemy }}
[keystone_authtoken]
auth_plugin = {{ heat_keystone_auth_plugin }}
signing_dir = /var/cache/heat
auth_url = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internaluri }}
project_domain_id = {{ heat_service_project_domain_id }}
user_domain_id = {{ heat_service_user_domain_id }}
project_name = {{ heat_service_project_name }}
username = {{ heat_service_user_name }}
password = {{ heat_service_password }}
identity_uri = {{ keystone_service_adminuri }}
auth_uri = {{ keystone_service_internalurl }}
admin_tenant_name = {{ heat_service_project_name }}
admin_user = {{ heat_service_user_name }}
admin_password = {{ heat_service_password }}
memcached_servers = {{ memcached_servers }}