ceph: wait-for-osds-up option for restart

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 75136a83227a7672e72a0ba20d278ec813d59416)

diff --git a/teuthology/task/ceph.py b/teuthology/task/ceph.py
index db48b16e4e16797071bdab2d03581931207d9848..81ff448d43790645f593f867f093ab1e6651231b 100644 (file)
--- a/teuthology/task/ceph.py
+++ b/teuthology/task/ceph.py
@@ -968,6 +968,8 @@ def restart(ctx, config):
                daemon.restart()
    if config.get('wait-for-healthy', True):
        healthy(ctx=ctx, config=None)
+   if config.get('wait-for-osds-up', False):
+       wait_for_osds_up(ctx=ctx, config=None)
    yield
 
 @contextlib.contextmanager