From: Josh Durgin <jdurgin@redhat.com>
Date: Wed, 23 Mar 2016 20:08:33 +0000 (-0700)
Subject: tasks/thrashosds: adjust to per-cluster managers
X-Git-Tag: v11.1.1~58^2^2~212^2~33
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=05bddf90766aeeabaf4e2274c66eaa8b4db425c9;p=ceph.git

tasks/thrashosds: adjust to per-cluster managers

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

diff --git a/tasks/thrashosds.py b/tasks/thrashosds.py
index 70912823bcc9..a159759c0a49 100644
--- a/tasks/thrashosds.py
+++ b/tasks/thrashosds.py
@@ -184,8 +184,9 @@ def task(ctx, config):
                             r=remote.name))
 
     log.info('Beginning thrashosds...')
+    cluster_manager = ctx.managers[cluster]
     thrash_proc = ceph_manager.Thrasher(
-        ctx.manager,
+        cluster_manager,
         config,
         logger=log.getChild('thrasher')
         )
@@ -194,4 +195,4 @@ def task(ctx, config):
     finally:
         log.info('joining thrashosds')
         thrash_proc.do_join()
-        ctx.manager.wait_for_recovery(config.get('timeout', 360))
+        cluster_manager.wait_for_recovery(config.get('timeout', 360))