qa: create_cache_pool no longer runs 'pool application enable'

Fixes: http://tracker.ceph.com/issues/21155
Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py
index 9c5ad1268a60d43027aae079ede6d5716be1165e..54c281a5a46247e0231497080d1f3042c88ce5c1 100644 (file)
--- 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
index 09388ab38cd52f986d3291d1d1a7de5f30395526..86c4b53892135e53d4b02fef8c06a965a29a4b4f 100644 (file)
--- a/qa/tasks/util/rados.py
+++ b/qa/tasks/util/rados.py
@@ -45,7 +45,7 @@ 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
     ])
@@ -53,10 +53,6 @@ def create_cache_pool(remote, base_name, cache_name, pgnum, size, cluster_name="
         '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):
     """