qa/tasks/cephfs/fuse_mount: pass admin_socket path

For ceph.py this comes from the ceph.conf.template, but it's not there
for cephadm.  Instead of inflicting this on the config inside the
container, just pass it to ceph-fuse incantation here.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit c2d53135fd475115b690fe462b94e24ce6e0eaf9)

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 711a3978669177288f7f3a9d786fbad2eb6a1614..8fef53fc221e5e58bef3b8e9fb6db4aaab45dc93 100644 (file)
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -83,7 +83,10 @@ class FuseMount(CephFSMount):
             daemon_signal,
         ]
 
-        fuse_cmd = ['ceph-fuse', "-f"]
+        fuse_cmd = [
+            'ceph-fuse', "-f",
+            "--admin-socket", "/var/run/ceph/$cluster-$name.$pid.asok",
+        ]
         if self.client_id is not None:
             fuse_cmd += ['--id', self.client_id]
         if self.client_keyring_path and self.client_id is not None: