From 20feff717f7063950b4f1db98e091b0a0bb7a559 Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Tue, 30 Jul 2019 16:58:02 +0530 Subject: [PATCH] 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 (cherry picked from commit b7005a2ac2dacb7eb7b8116ca86068be82cc3807) --- qa/tasks/cephfs/kernel_mount.py | 3 +++ qa/tasks/cephfs/mount.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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): -- 2.39.5