From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 17 Mar 2016 01:23:06 +0000 (-0700)
Subject: misc: add cluster param to wait_until_healthy()
X-Git-Tag: 1.1.0~615^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=33c2991afde2011b3da5e910598a83a211556fbc;p=teuthology.git

misc: add cluster param to wait_until_healthy()

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---

diff --git a/teuthology/misc.py b/teuthology/misc.py
index 0c38ba8a4..7fad219c9 100644
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@ -912,7 +912,7 @@ def get_scratch_devices(remote):
     return retval
 
 
-def wait_until_healthy(ctx, remote):
+def wait_until_healthy(ctx, remote, ceph_cluster='ceph'):
     """
     Wait until a Ceph cluster is healthy. Give up after 15min.
     """
@@ -925,6 +925,7 @@ def wait_until_healthy(ctx, remote):
                     'ceph-coverage',
                     '{tdir}/archive/coverage'.format(tdir=testdir),
                     'ceph',
+                    '--cluster', ceph_cluster,
                     'health',
                 ],
                 stdout=StringIO(),