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

 * add usage of configuraion ceph username instead of harcoded

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

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 }}
 
diff --git a/service/nova-compute.yaml b/service/nova-compute.yaml
index 9716825..657cb22 100644
--- a/service/nova-compute.yaml
+++ b/service/nova-compute.yaml
@@ -54,5 +54,5 @@ files:
     path: /etc/ceph/ceph.conf
     content: ceph.conf.j2
   nova-ceph-key:
-    path: /etc/ceph/ceph.client.cinder.keyring
+    path: /etc/ceph/ceph.client.{{ cinder.ceph.username }}.keyring
     content: ceph.client.cinder.keyring.j2