From 3948f108a847744de4197333ccb50f8a3c6fada5 Mon Sep 17 00:00:00 2001
From: Josh Durgin <jdurgin@redhat.com>
Date: Thu, 24 Mar 2016 20:24:01 -0700
Subject: [PATCH] tasks/ceph: make restart subtask cluster-aware
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
---
tasks/ceph.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tasks/ceph.py b/tasks/ceph.py
index 449208edcab..40bd1d1ac04 100644
--- a/tasks/ceph.py
+++ b/tasks/ceph.py
@@ -1212,14 +1212,18 @@ def restart(ctx, config):
config = {'daemons': config}
daemons = ctx.daemons.resolve_role_list(config.get('daemons', None), CEPH_ROLE_TYPES, True)
+ clusters = set()
for role in daemons:
cluster, type_, id_ = teuthology.split_role(role)
ctx.daemons.get_daemon(type_, id_, cluster).restart()
+ clusters.add(cluster)
if config.get('wait-for-healthy', True):
- healthy(ctx=ctx, config=None)
+ for cluster in clusters:
+ healthy(ctx=ctx, config=dict(cluster=cluster))
if config.get('wait-for-osds-up', False):
- wait_for_osds_up(ctx=ctx, config=None)
+ for cluster in clusters:
+ wait_for_osds_up(ctx=ctx, config=dict(cluster=cluster))
yield