From: Sébastien Han <sebastien.han@enovance.com>
Date: Tue, 11 Nov 2014 11:01:31 +0000 (+0100)
Subject: Add more detail for the client socket
X-Git-Tag: v1.0.0~308^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1d8871e6157b5aa7d0a04b271079352906d2bf37;p=ceph-ansible.git

Add more detail for the client socket

Adding: cluster name, type, id and cctid.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
---

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 558962ff1..1284f3a15 100644
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -59,7 +59,7 @@
 [client]
   rbd cache = true
   rbd cache writethrough until flush = true
-  admin socket = /var/run/ceph/rbd-client-$pid.asok
+  admin socket = /var/run/ceph/$cluster-$type.$id.$pid.$cctid.asok
 
 [mon]
   mon osd down out interval = {{ mon_osd_down_out_interval }}