]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/cephfs: fix FuseMount bin path in vstart
authorJohn Spray <john.spray@redhat.com>
Fri, 2 Oct 2015 16:38:23 +0000 (17:38 +0100)
committerJohn Spray <john.spray@redhat.com>
Fri, 2 Oct 2015 16:41:18 +0000 (17:41 +0100)
FuseMount only uses the prefix for finding the 'ceph'
executable, which is in ./ for either cmake or
authtools, not ./src for cmake like other binaries.

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

index 7292f52b3e03b7e5a151c77eddad223b14021c86..53c2662d5985ee665d543f32464a104830f7245b 100644 (file)
@@ -65,7 +65,7 @@ import subprocess
 
 if os.path.exists("./CMakeCache.txt"):
     # Running in build dir of a cmake build
-    BIN_PREFIX = "./src"
+    BIN_PREFIX = "./src/"
 else:
     # Running in src/ of an autotools build
     BIN_PREFIX = "./"
@@ -369,7 +369,9 @@ class LocalFuseMount(FuseMount):
 
     @property
     def _prefix(self):
-        return BIN_PREFIX
+        # FuseMount only uses the prefix for running ceph, which in cmake or autotools is in
+        # the present path
+        return "./"
 
     def _asok_path(self):
         # In teuthology, the asok is named after the PID of the ceph-fuse process, because it's