From af67a7152cdff9f266dfa4b0e5aa0c7afa144298 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Thu, 4 Aug 2022 13:58:56 -0600 Subject: [PATCH] tasks/cephadm: Add 'osd_method' config item Since the default of None gets interpreted as 'lvm', the only useful value would be 'raw'. This will enable us to use loop devices inside containers for OSDs. Signed-off-by: Zack Cerza --- qa/tasks/cephadm.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py index 97906b8a684c..73b0f08115f4 100644 --- a/qa/tasks/cephadm.py +++ b/qa/tasks/cephadm.py @@ -853,10 +853,12 @@ def ceph_osds(ctx, config): osd, remote.shortname, dev)) _shell(ctx, cluster_name, remote, [ 'ceph-volume', 'lvm', 'zap', dev]) - _shell(ctx, cluster_name, remote, [ - 'ceph', 'orch', 'daemon', 'add', 'osd', - remote.shortname + ':' + short_dev - ]) + add_osd_args = ['ceph', 'orch', 'daemon', 'add', 'osd', + remote.shortname + ':' + short_dev] + osd_method = config.get('osd_method') + if osd_method: + add_osd_args.append(osd_method) + _shell(ctx, cluster_name, remote, add_osd_args) ctx.daemons.register_daemon( remote, 'osd', id_, cluster=cluster_name, -- 2.47.3