]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/ceph.healthy: allow None as config
authorJosh Durgin <jdurgin@redhat.com>
Wed, 11 May 2016 19:07:16 +0000 (12:07 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 20 May 2016 18:21:36 +0000 (11:21 -0700)
This is used by the pg-removal-interruption test.

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

tasks/ceph.py

index f3b2705d3c229e13b1c9282e380c51eefe7513de..114f25b33cb401455319b4a600e0fd91d1aa8707 100644 (file)
@@ -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)