qa/tasks/cephadm.py: only pass --objectstore when not bluestore

This commit ensure that we only pass --objectstore argument to
cephadm's add/apply OSD command only when the value is not the
default value, bluestore.

This is done to ensure older ceph releases, like Squid and Tentacle
do not fail, as --objectstore argument was only added in Umbrella.

Fixes: https://tracker.ceph.com/issues/75731
Signed-off-by: Shraddha Agrawal <shraddha.agrawal000@gmail.com>

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index d4e1b78ab455ae3cb2133e57a45f18d92723e22c..39a30158fbacfe9e34ad7306659c25f6320c1c9f 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -1116,7 +1116,7 @@ def ceph_osds(ctx, config):
             if osd_type:
                 add_osd_args.extend(['--osd-type', osd_type])
             objectstore = config.get('conf', {}).get('osd', {}).get('osd objectstore')
-            if objectstore:
+            if objectstore and objectstore != 'bluestore':
                 add_osd_args.extend(['--objectstore', objectstore])
             if use_skip_validation:
                 try:
@@ -1146,7 +1146,7 @@ def ceph_osds(ctx, config):
             if osd_type:
                 osd_cmd.extend(['--osd-type', osd_type])
             objectstore = config.get('conf', {}).get('osd', {}).get('osd objectstore')
-            if objectstore:
+            if objectstore and objectstore != 'bluestore':
                 osd_cmd.extend(['--objectstore', objectstore])
             _shell(ctx, cluster_name, remote, osd_cmd)
             # expect the number of scratch devs