From: Sage Weil <sage@newdream.net>
Date: Mon, 1 Feb 2021 15:45:19 +0000 (-0600)
Subject: qa/tasks/cephfs/fuse_mount: pass admin_socket path
X-Git-Tag: v17.1.0~3055^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c2d53135fd475115b690fe462b94e24ce6e0eaf9;p=ceph.git

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>
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 711a397866917..8fef53fc221e5 100644
--- 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: