From: Rishabh Dave <ridave@redhat.com>
Date: Tue, 30 Jul 2019 11:27:31 +0000 (+0530)
Subject: qa/cephfs: allow specifying mountpoints for FUSE mounts
X-Git-Tag: v14.2.11~42^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2aaa734d01fdfaf47ad796b40cdeb91e17b81c8b;p=ceph.git

qa/cephfs: allow specifying mountpoints for FUSE mounts

Allow specifying the directory in CephFS that should be FUSE mounted at
the given path.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
(cherry picked from commit 48a95d00ba19e4ffa10a950444073135e83517bd)
---

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 057a056887da..7bb5e5160915 100644
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -27,7 +27,9 @@ class FuseMount(CephFSMount):
         self.inst = None
         self.addr = None
 
-    def mount(self, mount_path=None, mount_fs_name=None):
+    def mount(self, mount_path=None, mount_fs_name=None, mountpoint=None):
+        if mountpoint is not None:
+            self.mountpoint = mountpoint
         self.setupfs(name=mount_fs_name)
 
         try: