From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Wed, 6 Aug 2014 19:30:09 +0000 (-0400)
Subject: use  name in /var/lib/ceph paths
X-Git-Tag: v0.85~60^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3fb25c28e8e3cc62bc541538cc11f5ed41471611;p=ceph.git

use  name in /var/lib/ceph paths

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/src/ceph_common.sh b/src/ceph_common.sh
index d78f831f5e86..07faddc2fce1 100644
--- a/src/ceph_common.sh
+++ b/src/ceph_common.sh
@@ -50,12 +50,13 @@ check_host() {
 
     #echo host for $name is $host, i am $hostname
 
-    if [ -e "/var/lib/ceph/$type/ceph-$id/upstart" ]; then
+    cluster=$1
+    if [ -e "/var/lib/ceph/$type/$cluster-$id/upstart" ]; then
 	return 1
     fi
 
     # sysvinit managed instance in standard location?
-    if [ -e "/var/lib/ceph/$type/ceph-$id/sysvinit" ]; then
+    if [ -e "/var/lib/ceph/$type/$cluster-$id/sysvinit" ]; then
 	host="$hostname"
 	echo "=== $type.$id === "
 	return 0