From deaf440546d3396679dc63595202a859c415b54b Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Mon, 20 Apr 2015 16:17:07 +0100
Subject: [PATCH] Revert heat's keystone_authtoken configuration

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
---
 playbooks/roles/os_heat/templates/heat.conf.j2 | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/playbooks/roles/os_heat/templates/heat.conf.j2 b/playbooks/roles/os_heat/templates/heat.conf.j2
index b5840c6198..aaa5532a33 100644
--- a/playbooks/roles/os_heat/templates/heat.conf.j2
+++ b/playbooks/roles/os_heat/templates/heat.conf.j2
@@ -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 }}