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

qa/vstart_runner.py: allow specifying mountpoint for local FUSE mounts

Allow specifying the directory in CephFS that should be FUSE mounted on
the given path when running tests locally.

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

diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py
index 27a2c33b1227..84436e233d68 100644
--- a/qa/tasks/vstart_runner.py
+++ b/qa/tasks/vstart_runner.py
@@ -474,7 +474,9 @@ class LocalFuseMount(FuseMount):
         if self.is_mounted():
             super(LocalFuseMount, self).umount()
 
-    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)
 
         self.client_remote.run(