From 58e1520d93188ac2ed73e7afc569f1ed677e6388 Mon Sep 17 00:00:00 2001 From: Bjoern Teipel Date: Fri, 4 Mar 2016 16:44:57 -0600 Subject: [PATCH] Fix auth_url for heat configuration This fix configures the auth_url parameter to use keystone_service_adminurl over the existing keystone_service_adminuri parameter which actually leads to a incomplete URL lacking the API version like /v3/tokens Change-Id: I5d5b32dc9e91f9c127660d0b7fb96765f55b7b32 Related-Bug: #1552394 --- templates/heat.conf.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/heat.conf.j2 b/templates/heat.conf.j2 index a51e95f..c42356c 100644 --- a/templates/heat.conf.j2 +++ b/templates/heat.conf.j2 @@ -83,7 +83,7 @@ trace_sqlalchemy = {{ heat_profiler_trace_sqlalchemy }} insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ heat_keystone_auth_plugin }} signing_dir = {{ heat_system_home_folder }}/cache/heat -auth_url = {{ keystone_service_adminuri }} +auth_url = {{ keystone_service_adminurl }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ heat_service_project_domain_id }} user_domain_id = {{ heat_service_user_domain_id }} @@ -107,7 +107,7 @@ check_revocations_for_cached = False insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ heat_keystone_trustee_auth_plugin }} signing_dir = {{ heat_system_home_folder }}/cache/heat -auth_url = {{ keystone_service_adminuri }} +auth_url = {{ keystone_service_adminurl }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ heat_service_trustee_project_domain_id }} user_domain_id = {{ heat_service_trustee_user_domain_id }}