From 3f543ce6002fa5bf4d36800e7dd51e757f236a19 Mon Sep 17 00:00:00 2001
From: Bjoern Teipel <bjoern.teipel@rackspace.com>
Date: Wed, 7 Oct 2015 14:09:51 -0500
Subject: [PATCH] Removing fixed settings inside the glance-cache.conf

Using same overrides for the admin_user and admin_tenant_name
as the main glance API configuration.
This fix will make sure that the glance services will use the
same set of admin settings across multiple configuration files.

Change-Id: I8009cd1b9f5548f5272d37b48ca7b43e7a0b2f86
Closes-Bug: #1503837
---
 templates/glance-cache.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/glance-cache.conf.j2 b/templates/glance-cache.conf.j2
index 0f6e54c1..c60d0ff4 100644
--- a/templates/glance-cache.conf.j2
+++ b/templates/glance-cache.conf.j2
@@ -4,8 +4,8 @@
 verbose = {{ verbose }}
 debug = {{ debug }}
 admin_password = {{ glance_service_password }}
-admin_user = glance
-admin_tenant_name = service
+admin_user = {{ glance_service_user_name }}
+admin_tenant_name = {{ glance_service_project_name }}
 use_syslog = False
 image_cache_dir = {{ glance_system_user_home }}/cache/
 image_cache_stall_time = 86400