From c728f17d078ddfedfd49cf4097482617f28df6b5 Mon Sep 17 00:00:00 2001 From: Bjoern Teipel Date: Fri, 4 Mar 2016 14:55:30 -0600 Subject: [PATCH] Fix auth_url for glance 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: If7ca6ea13db317e37fb6453366c348752b84e3d0 Related-Bug: #1552394 --- templates/glance-api.conf.j2 | 2 +- templates/glance-registry.conf.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index a1eccf85..e036bc60 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -51,7 +51,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_ insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ glance_keystone_auth_plugin }} signing_dir = {{ glance_system_user_home }}/cache/api -auth_url = {{ keystone_service_adminuri }} +auth_url = {{ keystone_service_adminurl }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ glance_service_project_domain_id }} user_domain_id = {{ glance_service_user_domain_id }} diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index 192af924..898e12d9 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -27,7 +27,7 @@ connection = mysql+pymysql://{{ glance_galera_user }}:{{ glance_container_mysql_ insecure = {{ keystone_service_internaluri_insecure | bool }} auth_plugin = {{ glance_keystone_auth_plugin }} signing_dir = {{ glance_system_user_home }}/cache/registry/ -auth_url = {{ keystone_service_adminuri }} +auth_url = {{ keystone_service_adminurl }} auth_uri = {{ keystone_service_internaluri }} project_domain_id = {{ glance_service_project_domain_id }} user_domain_id = {{ glance_service_user_domain_id }}