From: John Spray <john.spray@redhat.com>
Date: Wed, 22 Jun 2016 12:00:08 +0000 (+0100)
Subject: tasks/cephfs: fix vstart_runner with cmake
X-Git-Tag: v11.1.1~58^2^2~152^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb517c6415dadcd07f2bbfe2f1c67918b7596e20;p=ceph.git

tasks/cephfs: fix vstart_runner with cmake

This needed updating for the CLI living in bin/ now

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/tasks/cephfs/vstart_runner.py b/tasks/cephfs/vstart_runner.py
index f552f60eb6c..62c7e5486c0 100644
--- a/tasks/cephfs/vstart_runner.py
+++ b/tasks/cephfs/vstart_runner.py
@@ -265,7 +265,9 @@ class LocalDaemon(object):
             if line.find("ceph-{0} -i {1}".format(self.daemon_type, self.daemon_id)) != -1:
                 log.info("Found ps line for daemon: {0}".format(line))
                 return int(line.split()[1])
-
+        log.info("No match for {0} {1}: {2}".format(
+            self.daemon_type, self.daemon_id, ps_txt
+            ))
         return None
 
     def wait(self, timeout):
@@ -330,9 +332,7 @@ class LocalFuseMount(FuseMount):
 
     @property
     def _prefix(self):
-        # FuseMount only uses the prefix for running ceph, which in cmake or autotools is in
-        # the present path
-        return "./"
+        return BIN_PREFIX
 
     def _asok_path(self):
         # In teuthology, the asok is named after the PID of the ceph-fuse process, because it's