]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: Replace 'ceph' with cluster name in restart() 21444/head
authorShilpa Jagannath <smanjara@redhat.com>
Mon, 16 Apr 2018 10:07:28 +0000 (15:37 +0530)
committerShilpa Jagannath <smanjara@redhat.com>
Mon, 19 Nov 2018 06:40:27 +0000 (12:10 +0530)
Enabled ctx.managers to take cluster name from config in restart() method instead of default 'ceph'.
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
qa/tasks/ceph.py

index cff56c0b02687d36b126c6f4d69f917fc4c1d258..2bd8787ed298aa0f4d2d07f23f58433b39140794 100644 (file)
@@ -1439,20 +1439,21 @@ def restart(ctx, config):
 
     daemons = ctx.daemons.resolve_role_list(config.get('daemons', None), CEPH_ROLE_TYPES, True)
     clusters = set()
-    manager = ctx.managers['ceph']
 
     with tweaked_option(ctx, config):
         for role in daemons:
             cluster, type_, id_ = teuthology.split_role(role)
             ctx.daemons.get_daemon(type_, id_, cluster).restart()
             clusters.add(cluster)
-
-    for dmon in daemons:
-        if '.' in dmon:
-            dm_parts = dmon.split('.')
-            if dm_parts[1].isdigit():
-                if dm_parts[0] == 'osd':
-                    manager.mark_down_osd(int(dm_parts[1]))
+    
+    for cluster in clusters:
+        manager = ctx.managers[cluster]
+        for dmon in daemons:
+            if '.' in dmon:
+                dm_parts = dmon.split('.')
+                if dm_parts[1].isdigit():
+                    if dm_parts[0] == 'osd':
+                        manager.mark_down_osd(int(dm_parts[1]))
 
     if config.get('wait-for-healthy', True):
         for cluster in clusters: