From: Sage Weil <sage@inktank.com>
Date: Fri, 7 Mar 2014 00:56:14 +0000 (-0800)
Subject: Revert "Do not spawn a parallel task if dictionary entry does not exist."
X-Git-Tag: 1.1.0~1627
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70de7d52d3c395e64dbb0c3244672ac4e3b0258d;p=teuthology.git

Revert "Do not spawn a parallel task if dictionary entry does not exist."

This reverts commit dadc9f7d0b6d9c13ccbc4edeb9f7875fc0ae0cac.
---

diff --git a/teuthology/task/parallel.py b/teuthology/task/parallel.py
index 35e45732d..4cfb67879 100644
--- a/teuthology/task/parallel.py
+++ b/teuthology/task/parallel.py
@@ -37,9 +37,10 @@ def task(ctx, config):
     log.info('starting parallel...')
     with parallel.parallel() as p:
         for entry in config:
-            if isinstance(entry, dict):
-                ((taskname, confg),) = entry.iteritems()
-                p.spawn(_run_spawned, ctx, confg, taskname)
+            if not isinstance(entry, dict):
+                entry = ctx.config.get(entry, {})
+            ((taskname, confg),) = entry.iteritems()
+            p.spawn(_run_spawned, ctx, confg, taskname)
 
 def _run_spawned(ctx,config,taskname):
     """Run one of the tasks (this runs in parallel with others)"""