From 620d6831918297fb02b21bde0b77bc2a03214335 Mon Sep 17 00:00:00 2001 From: Shraddha Agrawal Date: Mon, 30 Mar 2026 15:42:08 +0530 Subject: [PATCH] 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 --- qa/tasks/cephadm.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index d4e1b78ab455..39a30158fbac 100644 --- 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 -- 2.47.3