From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 11 May 2016 19:07:16 +0000 (-0700)
Subject: tasks/ceph.healthy: allow None as config
X-Git-Tag: v10.2.6~165^2^2~72^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3cfc7033d7c1d62270d0bed2bde2ab119050fa2d;p=ceph.git

tasks/ceph.healthy: allow None as config

This is used by the pg-removal-interruption test.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a67a123f0c0c3b9e33021ebd94a454961e4f46dd)
---

diff --git a/tasks/ceph.py b/tasks/ceph.py
index f3b2705d3c22..114f25b33cb4 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -1086,6 +1086,7 @@ def healthy(ctx, config):
     :param ctx: Context
     :param config: Configuration
     """
+    config = config if isinstance(config, dict) else dict()
     cluster_name = config.get('cluster', 'ceph')
     log.info('Waiting until ceph cluster %s is healthy...', cluster_name)
     firstmon = teuthology.get_first_mon(ctx, config, cluster_name)