From: Sage Weil <sage@inktank.com>
Date: Sat, 10 Nov 2012 16:41:41 +0000 (-0800)
Subject: ceph-fuse: apply overrides[ceph-fuse] to config
X-Git-Tag: 1.1.0~2417
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a46dd6b6056ed6ece2be08e4f2d2d7b3ea27b8cb;p=teuthology.git

ceph-fuse: apply overrides[ceph-fuse] to config
---

diff --git a/teuthology/task/ceph-fuse.py b/teuthology/task/ceph-fuse.py
index 9d1392155..ee619c953 100644
--- a/teuthology/task/ceph-fuse.py
+++ b/teuthology/task/ceph-fuse.py
@@ -38,7 +38,7 @@ def task(ctx, config):
         - ceph:
         - ceph-fuse:
             client.0:
-              valgrind: --tool=memcheck
+              valgrind: [--tool=memcheck, --leak-check=full, --show-reachable=yes]
         - interactive:
 
     """
@@ -51,6 +51,9 @@ def task(ctx, config):
     elif isinstance(config, list):
         config = dict((name, None) for name in config)
 
+    overrides = ctx.config.get('overrides', {})
+    teuthology.deep_merge(config, overrides.get('ceph-fuse', {}))
+
     clients = list(teuthology.get_clients(ctx=ctx, roles=config.keys()))
 
     for id_, remote in clients: