From 89610f4e5a137a8756a1003500e7a029616ffb7f Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Mon, 8 Dec 2014 18:53:43 +0300 Subject: [PATCH] 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 --- teuthology/task/kernel.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py index 1a3c71e753..50a192c799 100644 --- 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 -- 2.39.5