kernel: fix kernel installation when kdb: is specified

This normalize check would only trigger if a *single* key was specified.
Change it so that it triggers as long as all keys are in the list of valid
keys. This lets us specify both kdb: true and a sha1/branch/tag.

Phew!

diff --git a/teuthology/task/kernel.py b/teuthology/task/kernel.py
index ca4de6f87e40524b44789ac03b0c75ab9f81bee0..051ce20c46240205253f5ed6f2b3b024502677a8 100644 (file)
--- a/teuthology/task/kernel.py
+++ b/teuthology/task/kernel.py
@@ -40,8 +40,8 @@ def normalize_config(ctx, config):
     it is applied to all nodes.
     """
     if config is None or \
-            len(config) == 1 and config.keys() in [['tag'], ['branch'],
-                                                   ['sha1'], ['kdb']]:
+            len(filter(lambda x: x in ['tag', 'branch', 'sha1', 'kdb'],
+                       config.keys())) == len(config.keys()):
         new_config = {}
         if config is None:
             config = {'branch': 'master'}