From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 22:16:09 +0000 (+0000)
Subject: qa/tasks/ceph: wait-until-healthy
X-Git-Tag: v15.1.0~790^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c97b92adab9f3dc197d213823536205df0000bb8;p=ceph.git

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 77982304dd29..667f4eead808 100644
--- 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