From f3af610721899baa00d6c52f53ea54d30a71104f Mon Sep 17 00:00:00 2001
From: Neha Ojha <nojha@redhat.com>
Date: Wed, 6 Jan 2021 15:37:47 +0000
Subject: [PATCH] qa/tasks/cephadm.py: do not create rbd pool by default

rados/cephadm/smoke* does not use the install task and the adjust-ulimits
dependency is met as a part of it. create_rbd_pool needs adjust-ulimits,
so for now we will disable create_rbd_pool by default and only set it
to true for the upgrade suite.

Signed-off-by: Neha Ojha <nojha@redhat.com>
---
 qa/suites/upgrade/octopus-x/0-start.yaml |  1 +
 qa/tasks/cephadm.py                      | 33 ++++++++++++------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/qa/suites/upgrade/octopus-x/0-start.yaml b/qa/suites/upgrade/octopus-x/0-start.yaml
index 387053022ae..ad3ee43d38e 100644
--- a/qa/suites/upgrade/octopus-x/0-start.yaml
+++ b/qa/suites/upgrade/octopus-x/0-start.yaml
@@ -25,6 +25,7 @@ openstack:
     size: 10 # GB
 overrides:
   ceph:
+    create_rbd_pool: true
     conf:
       osd:
         osd shutdown pgref assert: true
diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index c2fa76dea24..54887685e40 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1019,25 +1019,24 @@ def crush_setup(ctx, config):
 
 @contextlib.contextmanager
 def create_rbd_pool(ctx, config):
-    cluster_name = config['cluster']
-    log.info('Waiting for OSDs to come up')
-    teuthology.wait_until_osds_up(
-        ctx,
-        cluster=ctx.cluster,
-        remote=ctx.ceph[cluster_name].bootstrap_remote,
-        ceph_cluster=cluster_name,
-    )
-    if config.get('create_rbd_pool', True):
-        log.info('Creating RBD pool')
-        _shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
-            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,
+    if config.get('create_rbd_pool', False):
+      cluster_name = config['cluster']
+      log.info('Waiting for OSDs to come up')
+      teuthology.wait_until_osds_up(
+          ctx,
+          cluster=ctx.cluster,
+          remote=ctx.ceph[cluster_name].bootstrap_remote,
+          ceph_cluster=cluster_name,
+      )
+      log.info('Creating RBD pool')
+      _shell(ctx, cluster_name, ctx.ceph[cluster_name].bootstrap_remote,
+          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'
-            ])
+          ])
     yield
 
 @contextlib.contextmanager
-- 
2.47.3