From 4d1569969127aa97d129f5b276f8f0220c3982f7 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 30 Mar 2016 23:01:37 -0700 Subject: [PATCH] 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 --- teuthology/ceph.conf.template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/teuthology/ceph.conf.template b/teuthology/ceph.conf.template index 666be464e..8f052963c 100644 --- 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 -- 2.47.3