ceph.conf.template: add cluster name to paths

This is more like the defaults, and makes non-osd daemons from
multiple clusters work on the same host.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template
index 666be464e5e5b3ef484fbd6105b5d4608fc8f37c..8f052963c392b9af651a81157558eeaedcca221c 100644 (file)
--- a/teuthology/ceph.conf.template
+++ b/teuthology/ceph.conf.template
@@ -1,6 +1,6 @@
 [global]
        chdir = ""
-       pid file = $name.pid
+       pid file = /var/run/ceph/$cluster-$name.pid
         auth supported = cephx
 
        filestore xattr use omap = true
@@ -67,8 +67,8 @@
         rgw cache enabled = true
        rgw enable ops log = true
        rgw enable usage log = true
-       log file = /var/log/ceph/ceph-$name.$pid.log
-       admin socket = /var/run/ceph/ceph-$name.$pid.asok
+       log file = /var/log/ceph/$cluster-$name.$pid.log
+       admin socket = /var/run/ceph/$cluster-$name.$pid.asok
 
 
        client mount timeout = 600