]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/ceph: make wait_for_osds_up cluster-aware
authorJosh Durgin <jdurgin@redhat.com>
Fri, 25 Mar 2016 03:22:16 +0000 (20:22 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 20 May 2016 18:08:53 +0000 (11:08 -0700)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit bb76deaf5784dfaf3a7ea0a7bb4a601f89d681d4)

tasks/ceph.py

index 8711c214a3fd77f434aede9e814ed5e1abe9d138..92ebdbe1611c29f846308013556be867b9d766c3 100644 (file)
@@ -1127,7 +1127,8 @@ def wait_for_osds_up(ctx, config):
     :param config: Configuration
     """
     log.info('Waiting until ceph osds are all up...')
-    firstmon = teuthology.get_first_mon(ctx, config)
+    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,