From 0cfc065a9f7f41c7fb34570da2a4691950e6c542 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Fri, 19 Jan 2018 19:18:50 -0800 Subject: [PATCH] sync rados.py changes Signed-off-by: Vasu Kulkarni --- qa/tasks/util/rados.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/qa/tasks/util/rados.py b/qa/tasks/util/rados.py index 09388ab38cd52..a83f9e19082d4 100644 --- a/qa/tasks/util/rados.py +++ b/qa/tasks/util/rados.py @@ -34,7 +34,7 @@ def create_ec_pool(remote, name, profile_name, pgnum, profile={}, cluster_name=" if application: remote.run(args=[ 'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name - ]) + ], check_status=False) # may fail as EINVAL when run in jewel upgrade test def create_replicated_pool(remote, name, pgnum, cluster_name="ceph", application=None): remote.run(args=[ @@ -43,9 +43,9 @@ def create_replicated_pool(remote, name, pgnum, cluster_name="ceph", application if application: remote.run(args=[ 'sudo', 'ceph', 'osd', 'pool', 'application', 'enable', name, application, '--cluster', cluster_name - ]) + ], check_status=False) -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