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

 * add usage of configuraion ceph username instead of harcoded

Change-Id: Iaa4bcbfc916f80faf089b61933651bbc19bd5557
---
 service/cinder-volume.yaml                  | 2 +-
 service/files/ceph.client.cinder.keyring.j2 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/cinder-volume.yaml b/service/cinder-volume.yaml
index 3b001ac..1c8d41f 100644
--- a/service/cinder-volume.yaml
+++ b/service/cinder-volume.yaml
@@ -28,5 +28,5 @@ files:
     path: /etc/ceph/ceph.conf
     content: ceph.conf.j2
   cinder-ceph-key:
-    path: /etc/ceph/ceph.client.cinder.keyring
+    path: /etc/ceph/ceph.client.{{ cinder.ceph.username }}.keyring
     content: ceph.client.cinder.keyring.j2
diff --git a/service/files/ceph.client.cinder.keyring.j2 b/service/files/ceph.client.cinder.keyring.j2
index 109da40..71daf6b 100644
--- a/service/files/ceph.client.cinder.keyring.j2
+++ b/service/files/ceph.client.cinder.keyring.j2
@@ -1,3 +1,3 @@
-[client.cinder]
+[client.{{ cinder.ceph.username }}]
 key = {{ cinder.ceph.key }}