Refactor ceph healthy waiting into a separate subtask.

Note, not a context manager, just a task. There's no cleanup.

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index b887e0aa6ce7d1ddd6556d789c9bb1674c3c7198..538a5d9411591572bcb7d6a135e1d46c6ef3852e 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -505,6 +505,14 @@ def mds(ctx, config):
         run.wait(mds_daemons.itervalues())
 
 
+def healthy(ctx, config):
+    log.info('Waiting until ceph is healthy...')
+    (mon0_remote,) = ctx.cluster.only('mon.0').remotes.keys()
+    teuthology.wait_until_healthy(
+        remote=mon0_remote,
+        )
+
+
 @contextlib.contextmanager
 def task(ctx, config):
     """
@@ -604,13 +612,7 @@ def task(ctx, config):
                 coverage=config.get('coverage'),
                 )),
         ):
-
-        log.info('Waiting until ceph is healthy...')
-        (mon0_remote,) = ctx.cluster.only('mon.0').remotes.keys()
-        teuthology.wait_until_healthy(
-            remote=mon0_remote,
-            )
-
+        healthy(ctx=ctx, config=None)
         yield
 
     if ctx.archive is not None: