From 8defa350c4d35041a71d24d561278ea98c21ad5b Mon Sep 17 00:00:00 2001
From: Igor Yozhikov <iyozhikov@mirantis.com>
Date: Mon, 5 Dec 2016 18:02:34 +0300
Subject: [PATCH] Fix hardcode in ceph options

 * add usage of configuraion ceph username instead of harcoded

Change-Id: Idb5fa3a8c51c8e750204c8a039d48b20c10a6035
---
 service/files/ceph.client.glance.keyring.j2 | 2 +-
 service/glance-api.yaml                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/files/ceph.client.glance.keyring.j2 b/service/files/ceph.client.glance.keyring.j2
index ac0c6db..44d4d69 100644
--- a/service/files/ceph.client.glance.keyring.j2
+++ b/service/files/ceph.client.glance.keyring.j2
@@ -1,3 +1,3 @@
-[client.glance]
+[client.{{ glance.ceph.username }}]
 key = {{ glance.ceph.key }}
 
diff --git a/service/glance-api.yaml b/service/glance-api.yaml
index 1136ce7..0b602e2 100644
--- a/service/glance-api.yaml
+++ b/service/glance-api.yaml
@@ -85,7 +85,7 @@ files:
     path: /etc/ceph/ceph.conf
     content: ceph.conf.j2
   glance-ceph-key:
-    path: /etc/ceph/ceph.client.glance.keyring
+    path: /etc/ceph/ceph.client.{{ glance.ceph.username }}.keyring
     content: ceph.client.glance.keyring.j2
   glance-swift-conf:
     path: /etc/glance/glance-swift-store.conf