From e00437ae897741a10545ab1bcc32f94b530831c4 Mon Sep 17 00:00:00 2001 From: Josh Durgin Date: Thu, 24 Mar 2016 17:15:14 -0700 Subject: [PATCH] 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 --- tasks/ceph_objectstore_tool.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/tasks/ceph_objectstore_tool.py b/tasks/ceph_objectstore_tool.py index 3b899de33b8a0..b72d98b748c5c 100644 --- 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')) -- 2.39.5