tasks/thrashosds: fix powercycle, bdev_inject_crash

The CephManager.kill_osd expects these in its config, not
Thrasher's.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/tasks/thrashosds.py b/tasks/thrashosds.py
index 6acde5e9cab58d23b73dd9345959fbe6ac25ef7f..d7cbc93f2c635e1e45bf59b931fd7d926cfbb427 100644 (file)
--- a/tasks/thrashosds.py
+++ b/tasks/thrashosds.py
@@ -159,8 +159,12 @@ def task(ctx, config):
                         'but not available on osd role: {r}'.format(
                             r=remote.name))
 
-    log.info('Beginning thrashosds...')
     cluster_manager = ctx.managers[cluster]
+    for f in ['powercycle', 'bdev_inject_crash']:
+        if config.get(f):
+            cluster_manager.config[f] = config.get(f)
+
+    log.info('Beginning thrashosds...')
     thrash_proc = ceph_manager.Thrasher(
         cluster_manager,
         config,