]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-fuse: apply overrides[ceph-fuse] to config
authorSage Weil <sage@inktank.com>
Sat, 10 Nov 2012 16:41:41 +0000 (08:41 -0800)
committerSage Weil <sage@inktank.com>
Sun, 11 Nov 2012 15:13:09 +0000 (07:13 -0800)
teuthology/task/ceph-fuse.py

index 9d139215507c44d1192bb716292db480a82d3523..ee619c953e75c2617c333b6ac4e61d5193b0681a 100644 (file)
@@ -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: