From f85f5dd7e3c9dc5ad25ee920efab6ce5fd586656 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 17 Nov 2011 13:07:03 -0800 Subject: [PATCH] ceph: deep merge overrides, so e.g. log whitelists can be overridden --- teuthology/task/ceph.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py index 9b4a548a72..986fb6f7b4 100644 --- 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 -- 2.39.5