From 054297450484ff99f95470905cd6d8986c26e2c4 Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Mon, 28 Aug 2017 10:14:03 -0400 Subject: [PATCH] qa: create_cache_pool no longer runs 'pool application enable' Fixes: http://tracker.ceph.com/issues/21155 Signed-off-by: Casey Bodley --- qa/tasks/rgw.py | 2 +- qa/tasks/util/rados.py | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/qa/tasks/rgw.py b/qa/tasks/rgw.py index 9c5ad1268a60d..54c281a5a4624 100644 --- 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 09388ab38cd52..86c4b53892135 100644 --- 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): """ -- 2.39.5