]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
tasks/radosbench: adjust to new ctx.manager location
authorJosh Durgin <jdurgin@redhat.com>
Fri, 25 Mar 2016 01:06:05 +0000 (18:06 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Mon, 9 May 2016 18:52:00 +0000 (11:52 -0700)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
tasks/radosbench.py

index bb1b8252403b866d88c6a02e454468ea22f452a5..3db57af83f819017758ad64f553fef36d13d55db 100644 (file)
@@ -45,6 +45,7 @@ def task(ctx, config):
     radosbench = {}
 
     testdir = teuthology.get_testdir(ctx)
+    manager = ctx.managers['ceph']
 
     create_pool = config.get('create_pool', True)
     for role in config.get('clients', ['client.0']):
@@ -57,7 +58,7 @@ def task(ctx, config):
         if config.get('ec_pool', False):
             profile = config.get('erasure_code_profile', {})
             profile_name = profile.get('name', 'teuthologyprofile')
-            ctx.manager.create_erasure_code_profile(profile_name, profile)
+            manager.create_erasure_code_profile(profile_name, profile)
         else:
             profile_name = None
 
@@ -68,9 +69,9 @@ def task(ctx, config):
         pool = config.get('pool', 'data')
         if create_pool:
             if pool != 'data':
-                ctx.manager.create_pool(pool, erasure_code_profile_name=profile_name)
+                manager.create_pool(pool, erasure_code_profile_name=profile_name)
             else:
-                pool = ctx.manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
+                pool = manager.create_pool_with_unique_name(erasure_code_profile_name=profile_name)
 
         proc = remote.run(
             args=[
@@ -100,4 +101,4 @@ def task(ctx, config):
         run.wait(radosbench.itervalues(), timeout=timeout)
 
         if pool is not 'data' and create_pool:
-            ctx.manager.remove_pool(pool)
+            manager.remove_pool(pool)