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

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 6314183c3b3742ebecc78f0d792e3f47d1060c9a..24f0c3831e8afd2d8e683cb65ffc072f960f8501 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -472,12 +472,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 23a3e2cf9d7bea131ee562b6ae388c759fccea3e..765e2a9248cbe183ef4a818105d022186f9922db 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1820,10 +1820,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