Merge pull request #17312 from cbodley/wip-21155

qa: create_cache_pool no longer runs 'pool application enable' Reviewed-by: Kefu Chai <kchai@redhat.com>
ceph · Aug 29, 2017 · d24ba40 · d24ba40
2 parents f4c4a9d + 0542974
commit d24ba40
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
@@ -171,7 +171,7 @@ def create_pools(ctx, clients):
             create_replicated_pool(remote, data_pool, 64, cluster_name, 'rgw')
         if ctx.rgw.cache_pools:
             create_cache_pool(remote, data_pool, data_pool + '.cache', 64,
-                              64*1024*1024, cluster_name, 'rgw')
+                              64*1024*1024, cluster_name)
     log.debug('Pools created')
     yield
 

diff --git a/qa/tasks/util/rados.py b/qa/tasks/util/rados.py
@@ -45,18 +45,14 @@ def create_replicated_pool(remote, name, pgnum, cluster_name="ceph", application
             'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name
         ])
 
-def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="ceph", application=None):
+def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="ceph"):
     remote.run(args=[
         'sudo', 'ceph', 'osd', 'pool', 'create', cache_name, str(pgnum), '--cluster', cluster_name
     ])
     remote.run(args=[
         'sudo', 'ceph', 'osd', 'tier', 'add-cache', base_name, cache_name,
         str(size), '--cluster', cluster_name
     ])
-    if application:
-        remote.run(args=[
-            'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name
-        ])
 
 def cmd_erasure_code_profile(profile_name, profile):
     """