install: make exclude_packages distro-agnostic (in a limited way)

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/teuthology/task/install/__init__.py b/teuthology/task/install/__init__.py
index 910d4fcda32bfba9f51aac2bf0bae3de63528d99..dcf17343d61ceb5ba9889a86f5e5ba30370a102e 100644 (file)
--- a/teuthology/task/install/__init__.py
+++ b/teuthology/task/install/__init__.py
@@ -198,15 +198,17 @@ def get_package_list(ctx, config):
         debs = filter(lambda p: not p.endswith('-dbg'), debs)
         rpms = filter(lambda p: not p.endswith('-debuginfo'), rpms)
 
-    excluded_packages = config.get('exclude_packages', list())
-    if excluded_packages:
-        log.debug("Excluding packages: {}".format(excluded_packages))
-
-        def exclude(pkgs):
-            return list(set(pkgs).difference(set(excluded_packages)))
+    def exclude(pkgs, exclude_list):
+        return list(set(pkgs).difference(set(exclude_list)))
 
-        debs = exclude(debs)
-        rpms = exclude(rpms)
+    excluded_packages = config.get('exclude_packages', [])
+    if isinstance(excluded_packages, dict):
+        log.debug("Excluding packages: {}".format(excluded_packages))
+        debs = exclude(debs, excluded_packages.get('deb', []))
+        rpms = exclude(rpms, excluded_packages.get('rpm', []))
+    else:
+        debs = exclude(debs, excluded_packages)
+        rpms = exclude(rpms, excluded_packages)
 
     package_list = dict(deb=debs, rpm=rpms)
     log.debug("Package list is: {}".format(package_list))