ceph: deep merge overrides, so e.g. log whitelists can be overridden

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index 9b4a548a7249f3db643f8ca4aa5a2cc09246c0cf..986fb6f7b4a9d8f27e1a3d7cde60dab858349753 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -1000,7 +1000,7 @@ def task(ctx, config):
         "task ceph only supports a dictionary for configuration"
 
     overrides = ctx.config.get('overrides', {})
-    config.update(overrides.get('ceph', {}))
+    teuthology.deep_merge(config, overrides.get('ceph', {}))
 
     ctx.daemons = CephState()
     flavor = None