tasks/ceph_objectstore_tool: use existing manager

This is only used after the ceph task, which already createds a
manager for the cluster. Use the default 'ceph' cluster manager for
now.

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

diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py
index 3b899de33b8a03377970d47fec107c1f0febb7dd..b72d98b748c5c9b6ba57d855123278e0d9a67cff 100644 (file)
--- a/tasks/ceph_objectstore_tool.py
+++ b/tasks/ceph_objectstore_tool.py
@@ -173,16 +173,7 @@ def task(ctx, config):
     log.info(osds)
     log.info(osds.remotes)
 
-    first_mon = teuthology.get_first_mon(ctx, config)
-    (mon,) = ctx.cluster.only(first_mon).remotes.iterkeys()
-    manager = ceph_manager.CephManager(
-        mon,
-        ctx=ctx,
-        config=config,
-        logger=log.getChild('ceph_manager'),
-        )
-    ctx.manager = manager
-
+    manager = ctx.managers['ceph']
     while (len(manager.get_osd_status()['up']) !=
            len(manager.get_osd_status()['raw'])):
         time.sleep(10)
@@ -222,7 +213,7 @@ def task(ctx, config):
 
 
 def test_objectstore(ctx, config, cli_remote, REP_POOL, REP_NAME, ec=False):
-    manager = ctx.manager
+    manager = ctx.managers['ceph']
 
     osds = ctx.cluster.only(teuthology.is_type('osd'))