qa/tasks/ceph: wait-until-healthy

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/tasks/ceph2.py b/qa/tasks/ceph2.py
index 77982304dd29f7e40f46f7a8b20f1020b7ecaca4..667f4eead80887efedba38a27880e9cd65d134ba 100644 (file)
--- a/qa/tasks/ceph2.py
+++ b/qa/tasks/ceph2.py
@@ -29,7 +29,7 @@ from teuthology.orchestra.daemon import DaemonGroup
 from tasks.daemonwatchdog import DaemonWatchdog
 
 # these items we use from ceph.py should probably eventually move elsewhere
-from tasks.ceph import get_mons
+from tasks.ceph import get_mons, healthy
 
 CEPH_ROLE_TYPES = ['mon', 'mgr', 'osd', 'mds', 'rgw']
 
@@ -700,6 +700,9 @@ def task(ctx, config):
         )
 
         try:
+            if config.get('wait-for-healthy', True):
+                healthy(ctx=ctx, config=config)
+
             log.info('Setup complete, yielding')
             yield