From 91166bef5d86563c885b7faba34f3416d761ec40 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Wed, 16 Mar 2016 18:21:55 -0700 Subject: [PATCH] misc: add cluster param to wait_until_osds_up() Signed-off-by: Josh Durgin --- teuthology/misc.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/teuthology/misc.py b/teuthology/misc.py index 1d8275548b..0c38ba8a43 100644 --- a/teuthology/misc.py +++ b/teuthology/misc.py @@ -937,9 +937,9 @@ def wait_until_healthy(ctx, remote): time.sleep(1) -def wait_until_osds_up(ctx, cluster, remote): +def wait_until_osds_up(ctx, cluster, remote, ceph_cluster='ceph'): """Wait until all Ceph OSDs are booted.""" - num_osds = num_instances_of_type(cluster, 'osd') + num_osds = num_instances_of_type(cluster, 'osd', ceph_cluster) testdir = get_testdir(ctx) while True: r = remote.run( @@ -948,6 +948,7 @@ def wait_until_osds_up(ctx, cluster, remote): 'ceph-coverage', '{tdir}/archive/coverage'.format(tdir=testdir), 'ceph', + '--cluster', ceph_cluster, 'osd', 'dump', '--format=json' ], stdout=StringIO(), -- 2.39.5