]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
tasks/cephfs: fix vstart_runner with cmake
authorJohn Spray <john.spray@redhat.com>
Wed, 22 Jun 2016 12:00:08 +0000 (13:00 +0100)
committerJohn Spray <john.spray@redhat.com>
Thu, 30 Jun 2016 22:44:19 +0000 (23:44 +0100)
This needed updating for the CLI living in bin/ now

Signed-off-by: John Spray <john.spray@redhat.com>
tasks/cephfs/vstart_runner.py

index f552f60eb6ce49536d574363acce34305701b722..62c7e5486c0f4ce388d9fa62f3200b92b56b08d8 100644 (file)
@@ -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