qa: deep merge top level overrides for fuse/kclient

This allows for array/dict configs like mntopts to accumulate changes
from multiple yaml fragments.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 88f74dbfa634b904253fc14ab4787e51a7a4f9c4)

diff --git a/qa/tasks/ceph_fuse.py b/qa/tasks/ceph_fuse.py
index 405742891674357855c87a01b81977bda5b2d882..d2db2973220d9d7b40cf557ad8290b75044f3fe8 100644 (file)
--- a/qa/tasks/ceph_fuse.py
+++ b/qa/tasks/ceph_fuse.py
@@ -108,9 +108,7 @@ def task(ctx, config):
         if client_config is None:
             client_config = {}
         # top level overrides
-        for k, v in top_overrides.items():
-            if v is not None:
-                client_config[k] = v
+        misc.deep_merge(client_config, top_overrides)
         # mount specific overrides
         client_config_overrides = overrides.get(entity)
         misc.deep_merge(client_config, client_config_overrides)

diff --git a/qa/tasks/kclient.py b/qa/tasks/kclient.py
index be75286bd0dc81be6181eb15cd8a64e0af0b7bce..d7bc9fa835b55ea8817f7ac2b1c26aa164873f7e 100644 (file)
--- a/qa/tasks/kclient.py
+++ b/qa/tasks/kclient.py
@@ -84,9 +84,7 @@ def task(ctx, config):
         if client_config is None:
             client_config = {}
         # top level overrides
-        for k, v in top_overrides.items():
-            if v is not None:
-                client_config[k] = v
+        deep_merge(client_config, top_overrides)
         # mount specific overrides
         client_config_overrides = overrides.get(entity)
         deep_merge(client_config, client_config_overrides)