qa/tasks/{kclient,ceph_fuse}: allow mounting

... a specific filesystem.

Signed-off-by: Ramana Raja <rraja@redhat.com>
This commit is contained in:
Ramana Raja 2020-11-05 14:30:53 +05:30
parent 7016a2001d
commit 8c11cdf5dc
2 changed files with 6 additions and 2 deletions

View File

@ -121,6 +121,7 @@ def task(ctx, config):
client_config = {}
auth_id = client_config.get("auth_id", id_)
cephfs_name = client_config.get("cephfs_name")
skip = client_config.get("skip", False)
if skip:
@ -130,7 +131,8 @@ def task(ctx, config):
if id_ not in all_mounts:
fuse_mount = FuseMount(ctx=ctx, client_config=client_config,
test_dir=testdir, client_id=auth_id,
client_remote=remote, brxnet=brxnet)
client_remote=remote, brxnet=brxnet,
cephfs_name=cephfs_name)
all_mounts[id_] = fuse_mount
else:
# Catch bad configs where someone has e.g. tried to use ceph-fuse and kcephfs for the same client

View File

@ -84,6 +84,7 @@ def task(ctx, config):
deep_merge(client_config, overrides)
cephfs_name = client_config.get("cephfs_name")
if config.get("disabled", False) or not client_config.get('mounted', True):
continue
@ -93,7 +94,8 @@ def task(ctx, config):
client_id=id_,
client_remote=remote,
brxnet=ctx.teuthology_config.get('brxnet', None),
config=client_config)
config=client_config,
cephfs_name=cephfs_name)
mounts[id_] = kernel_mount