teuthology/task/install: conditionally merge extra_system_packages override

Fixes: https://tracker.ceph.com/issues/66093
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index b8249561c0bfbb34e3cae2fcb062b7c78243586d..c9e13194d359866b10ba42f04874634f8fb96a2a 100644 (file)
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -571,7 +571,9 @@ def task(ctx, config):
         install_overrides = overrides.get('install', {})
         log.debug('INSTALL overrides: %s' % install_overrides)
         teuthology.deep_merge(config, install_overrides.get(project, {}))
-        teuthology.deep_merge(extra_system_packages, install_overrides.get('extra_system_packages', {}))
+        overrides_extra_system_packages = install_overrides.get('extra_system_packages')
+        if overrides_extra_system_packages:
+            teuthology.deep_merge(extra_system_packages, overrides_extra_system_packages)
         repos = install_overrides.get('repos', None)
 
     log.debug('config %s' % config)