From 6336f83d5f2c6f71e1e44d51335bd104437c3666 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 8 Nov 2016 20:34:04 -0500 Subject: [PATCH] suites/fs: add ceph-fuse disable override Some tests require fuse mounts to not be unmounted. This avoids the need to manually specify clients as unmounted. Signed-off-by: Patrick Donnelly --- tasks/ceph_fuse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/ceph_fuse.py b/tasks/ceph_fuse.py index 9c308ae36ca..c9d83549668 100644 --- a/tasks/ceph_fuse.py +++ b/tasks/ceph_fuse.py @@ -98,7 +98,7 @@ def task(ctx, config): config = get_client_configs(ctx, config) # List clients we will configure mounts for, default is all clients - clients = list(teuthology.get_clients(ctx=ctx, roles=config.keys())) + clients = list(teuthology.get_clients(ctx=ctx, roles=filter(lambda x: 'client.' in x, config.keys()))) all_mounts = getattr(ctx, 'mounts', {}) mounted_by_me = {} @@ -116,7 +116,7 @@ def task(ctx, config): # Catch bad configs where someone has e.g. tried to use ceph-fuse and kcephfs for the same client assert isinstance(all_mounts[id_], FuseMount) - if client_config.get('mounted', True): + if not config.get("disabled", False) and client_config.get('mounted', True): mounted_by_me[id_] = all_mounts[id_] ctx.mounts = all_mounts -- 2.47.3