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

qa/cephfs: allow specifying mountpoint for kernel mounts

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

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

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index 3df4bdec5260e..bc3e2bb6a352e 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -27,6 +27,9 @@ class KernelMount(CephFSMount):
         self.ipmi_domain = ipmi_domain
 
     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)
 
         log.info('Mounting kclient client.{id} at {remote} {mnt}...'.format(
diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index 0d925338f23f2..ec106680ba194 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -60,7 +60,7 @@ class CephFSMount(object):
         self.fs.wait_for_daemons()
         log.info('Ready to start {}...'.format(type(self).__name__))
 
-    def mount(self, mount_path=None, mount_fs_name=None):
+    def mount(self, mount_path=None, mount_fs_name=None, mountpoint=None):
         raise NotImplementedError()
 
     def umount(self):