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 d78f831f5e866b9e1b9bf92763a485179174f259..07faddc2fce142b9ad1ae44bad417d3af15aab8a 100644 (file)
--- 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