From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 31 Mar 2016 06:01:37 +0000 (-0700)
Subject: ceph.conf.template: add cluster name to paths
X-Git-Tag: 1.1.0~615^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F841%2Fhead;p=teuthology.git

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 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