]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/rados: adjust to new ctx.manager location
authorJosh Durgin <jdurgin@redhat.com>
Fri, 25 Mar 2016 01:01:37 +0000 (18:01 -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/rados.py

index d518895225831427d15ca7b34bb8e64ff51aed9e..43f560cb850a3ca93bf14b7ee0b5647c431d6863 100644 (file)
@@ -199,10 +199,11 @@ def task(ctx, config):
         """Thread spawned by gevent"""
         clients = ['client.{id}'.format(id=id_) for id_ in teuthology.all_roles_of_type(ctx.cluster, 'client')]
         log.info('clients are %s' % clients)
+        manager = ctx.managers['ceph']
         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
         for i in range(int(config.get('runs', '1'))):
@@ -220,10 +221,10 @@ def task(ctx, config):
                 if not pool and existing_pools:
                     pool = existing_pools.pop()
                 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)
                     created_pools.append(pool)
                     if config.get('fast_read', False):
-                        ctx.manager.raw_cluster_cmd(
+                        manager.raw_cluster_cmd(
                             'osd', 'pool', 'set', pool, 'fast_read', 'true')
 
                 (remote,) = ctx.cluster.only(role).remotes.iterkeys()
@@ -238,7 +239,7 @@ def task(ctx, config):
             run.wait(tests.itervalues())
 
             for pool in created_pools:
-                ctx.manager.remove_pool(pool)
+                manager.remove_pool(pool)
 
     running = gevent.spawn(thread)