From: Sage Weil <sage@redhat.com>
Date: Tue, 12 Nov 2019 22:46:51 +0000 (+0000)
Subject: qa/tasks/ceph: replace wait_for_osds_up with manager.wait_for_all_osds_up
X-Git-Tag: v15.1.0~790^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2a1d0afe84d876b652ab7783ea57bca351ed7df;p=ceph.git

qa/tasks/ceph: replace wait_for_osds_up with manager.wait_for_all_osds_up

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

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 98eee696cddf..2baca41c4fa7 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1487,24 +1487,6 @@ def healthy(ctx, config):
         ceph_fs.wait_for_daemons(timeout=300)
 
 
-def wait_for_osds_up(ctx, config):
-    """
-    Wait for all osd's to come up.
-
-    :param ctx: Context
-    :param config: Configuration
-    """
-    log.info('Waiting until ceph osds are all up...')
-    cluster_name = config.get('cluster', 'ceph')
-    firstmon = teuthology.get_first_mon(ctx, config, cluster_name)
-    (mon0_remote,) = ctx.cluster.only(firstmon).remotes.keys()
-    teuthology.wait_until_osds_up(
-        ctx,
-        cluster=ctx.cluster,
-        remote=mon0_remote
-    )
-
-
 def wait_for_mon_quorum(ctx, config):
     """
     Check renote ceph status until all monitors are up.
@@ -1630,7 +1612,7 @@ def restart(ctx, config):
             healthy(ctx=ctx, config=dict(cluster=cluster))
     if config.get('wait-for-osds-up', False):
         for cluster in clusters:
-            wait_for_osds_up(ctx=ctx, config=dict(cluster=cluster))
+            ctx.managers[cluster].wait_for_all_osds_up()
     yield