kernel: fix 'sha1: distro' vs per role configs

We may want to setup different kernels for different roles (as long as
all roles on the same node agree on their choice), so returning as soon
as 'distro' is seen is not right.  Also, no need to use find() as
'distro' is always an exact match.

Signed-off-by: Ilya Dryomov <idryomov@redhat.com>

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index 1a3c71e753da3d81cacf8fed30d29ffe9b697e5f..50a192c7997ba38f8cdc89e49ea9cd7c14cb7845 100644 (file)
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -248,12 +248,13 @@ def download_kernel(ctx, config):
     :param config: Configuration
     """
     procs = {}
-    #Don't need to download distro kernels
     for role, src in config.iteritems():
+        if src == 'distro':
+            # don't need to download distro kernels
+            log.debug("src is distro, skipping download");
+            continue
+
         (role_remote,) = ctx.cluster.only(role).remotes.keys()
-       if src.find('distro') >= 0:
-            log.info('Installing newest kernel distro');
-            return
         package_type = teuthology.get_system_type(role_remote)
         if src.find('/') >= 0:
             # local deb