ceph: allow valgrind per-type (not just per-name)

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 2e492c78aaef7c15fc6387cd34971768d7799da0..3b2cb50550973e3edfeb212fd7d4fb42d3655792 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -771,8 +771,14 @@ def run_daemon(ctx, config, type_):
 
             extra_args = None
 
-            if config.get('valgrind') and (config.get('valgrind').get(name, None) is not None):
-                valgrind_args = config.get('valgrind').get(name)
+            valgrind_args = None
+            if config.get('valgrind'):
+                v = config.get('valgrind')
+                if v.get(type_, None) is not None:
+                    valgrind_args = v.get(type_)
+                if v.get(name, None) is not None:
+                    valgrind_args = v.get(name)
+            if valgrind_args is not None:
                 if not isinstance(valgrind_args, list):
                     valgrind_args = [valgrind_args]
                 log.debug('running %s under valgrind with args %s' % (name, valgrind_args))