qa/tasks: initialize rbd pool instead of just tagging it

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit fcc440da9aaa6585872e830a5e39aefce1df82fe)

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index a7b3ad4c5eec6b75a3bd1a1672e9fa6dc1ae6ff6..9177974ed08deba044a37a9664ea1e1e01dba673 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -410,12 +410,7 @@ def create_rbd_pool(ctx, config):
             args=['sudo', 'ceph', '--cluster', cluster_name,
                   'osd', 'pool', 'create', 'rbd', '8'])
         mon_remote.run(
-            args=[
-                'sudo', 'ceph', '--cluster', cluster_name,
-                'osd', 'pool', 'application', 'enable',
-                'rbd', 'rbd', '--yes-i-really-mean-it'
-            ],
-            check_status=False)
+            args=['rbd', '--cluster', cluster_name, 'pool', 'init', 'rbd'])
     yield
 
 @contextlib.contextmanager

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 67384b12d3ac2fdd74c01cb2ba4c5b4a69529805..8617c5025ca7750860602d0ffb32ad9fc0bb97b7 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1730,10 +1730,7 @@ def create_rbd_pool(ctx, config):
           args=['sudo', 'ceph', '--cluster', cluster_name,
                 'osd', 'pool', 'create', 'rbd', '8'])
       _shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
-          args=['sudo', 'ceph', '--cluster', cluster_name,
-                'osd', 'pool', 'application', 'enable',
-                'rbd', 'rbd', '--yes-i-really-mean-it'
-          ])
+          args=['rbd', 'pool', 'init', 'rbd'])
     yield