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: v15.1.0~639^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b7005a2ac2dacb7eb7b8116ca86068be82cc3807;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>
---

diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py
index f5265b22c488..c8d1ec6593f6 100644
--- a/qa/tasks/cephfs/kernel_mount.py
+++ b/qa/tasks/cephfs/kernel_mount.py
@@ -28,6 +28,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 23106aa5e6db..e8f1af8ed457 100644
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -58,7 +58,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):