From 24b09a92c50e65bc1a9fcba64b2d1c4601abfeeb Mon Sep 17 00:00:00 2001 From: Matt Thompson Date: Tue, 24 Feb 2015 14:32:51 +0000 Subject: [PATCH] Update auth_uri / identity_uri While testing glance + swift, I noticed that the glance-api.conf and glance-registry.conf being dropped had incorrect auth_uri / identity_uri values set. This change updates auth_uri / identity_uri throughout to point to the correct keystone_service_adminuri / keystone_service_internalurl variables. Change-Id: I3cbbfefe7da54b08bb9a55e4a2ca3a8bd786577d Closes-Bug: 1425099 --- templates/glance-api.conf.j2 | 4 ++-- templates/glance-cache.conf.j2 | 2 +- templates/glance-registry.conf.j2 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/glance-api.conf.j2 b/templates/glance-api.conf.j2 index 28a5ebaa..7937a274 100644 --- a/templates/glance-api.conf.j2 +++ b/templates/glance-api.conf.j2 @@ -42,8 +42,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password [keystone_authtoken] signing_dir = {{ glance_system_user_home }}/cache/api -identity_uri = {{ keystone_service_internaluri }} -auth_uri = {{ keystone_service_internaluri }} +identity_uri = {{ keystone_service_adminuri }} +auth_uri = {{ keystone_service_internalurl }} admin_tenant_name = {{ glance_service_tenant_name }} admin_user = {{ glance_service_user_name }} admin_password = {{ glance_service_password }} diff --git a/templates/glance-cache.conf.j2 b/templates/glance-cache.conf.j2 index d5f38ea6..0f6e54c1 100644 --- a/templates/glance-cache.conf.j2 +++ b/templates/glance-cache.conf.j2 @@ -12,5 +12,5 @@ image_cache_stall_time = 86400 image_cache_max_size = {{ glance_image_cache_max_size }} registry_host = {{ glance_registry_host }} registry_port = 9191 -auth_url = {{ keystone_service_internaluri }} +auth_url = {{ keystone_service_internalurl }} filesystem_store_datadir = {{ glance_system_user_home }}/images/ diff --git a/templates/glance-registry.conf.j2 b/templates/glance-registry.conf.j2 index f89e35f7..f09b335e 100644 --- a/templates/glance-registry.conf.j2 +++ b/templates/glance-registry.conf.j2 @@ -20,8 +20,8 @@ connection = mysql://{{ glance_galera_user }}:{{ glance_container_mysql_password [keystone_authtoken] signing_dir = {{ glance_system_user_home }}/cache/registry/ -identity_uri = {{ keystone_service_internaluri }} -auth_uri = {{ keystone_service_internaluri }} +identity_uri = {{ keystone_service_adminuri }} +auth_uri = {{ keystone_service_internalurl }} admin_tenant_name = {{ glance_service_tenant_name }} admin_user = {{ glance_service_user_name }} admin_password = {{ glance_service_password }}