Merge pull request #2103 from ceph/wip-extra-system-packages-fixup

task/install: extra_system_packages at the top level can be a list

Author: kshtsk

teuthology/task/install/__init__.py

@@ -427,8 +427,9 @@ def _override_extra_system_packages(config, project, install_overrides):
             e = dict(deb=copy.deepcopy(extra), rpm=copy.deepcopy(extra))
         elif isinstance(extra, dict):
             e = copy.deepcopy(extra)
-        elif isinstance(extra, str):
-            e = dict(deb=[extra], rpm=[extra])
+
+        if isinstance(extra_overrides, list):
+            extra_overrides = dict(deb=extra_overrides, rpm=extra_overrides)
 
         config['extra_system_packages'] = teuthology.deep_merge(e, extra_overrides)
 

teuthology/test/task/test_install.py

@@ -362,6 +362,28 @@ def test_rh_install_pkgs(self, m_get_pkg_version):
                     'rpm': ['alpha', 'xerxes', 'yellow'],
                 }
             ],
+            [
+                {
+                    'tasks': [ { 'install': { 'clean': True, }, }, ],
+                    'overrides': {
+                        'install': {
+                            'ceph': {
+                                 'extra_system_packages': {
+                                     'deb': [],
+                                     'rpm': ['xerxes', 'yellow'],
+                                 },
+                                 'flavor': 'default',
+                                 'sha1': '0123456789abcdef0123456789abcdef01234567',
+                             },
+                            'extra_system_packages': ['alpha'],
+                        },
+                    },
+                },
+                {
+                    'deb': ['alpha'],
+                    'rpm': ['xerxes', 'yellow', 'alpha'],
+                }
+            ],
             [
                 {
                     'tasks': [ { 'install': { 'clean': True, }, }, ],
@@ -383,6 +405,24 @@ def test_rh_install_pkgs(self, m_get_pkg_version):
                     'rpm': ['xerxes', 'yellow'],
                 }
             ],
+            [
+                {
+                    'tasks': [ { 'install': { 'clean': True, }, }, ],
+                    'overrides': {
+                        'install': {
+                            'ceph': {
+                                 'flavor': 'default',
+                                 'sha1': '0123456789abcdef0123456789abcdef01234567',
+                             },
+                            'extra_system_packages': ['xerxes', 'yellow'],
+                        },
+                    },
+                },
+                {
+                    'deb': ['xerxes', 'yellow'],
+                    'rpm': ['xerxes', 'yellow'],
+                }
+            ],
             [
                 {
                     'tasks': [ { 'install': { 'clean': True, }, }, ],