From 1d66d919d935bf26995ba039c3f9e26b98572401 Mon Sep 17 00:00:00 2001 From: Joshua Schmid Date: Wed, 1 Apr 2020 16:26:33 +0200 Subject: [PATCH] mgr/cephadm: use --osd-ids instead of --osd-id Signed-off-by: Joshua Schmid (cherry picked from commit fa88483f660f2bf79d1c1ca77d7104b3a42ed05d) --- src/python-common/ceph/deployment/translate.py | 2 +- src/python-common/ceph/tests/test_drive_group.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/python-common/ceph/deployment/translate.py b/src/python-common/ceph/deployment/translate.py index be2cde2007789..6f0fd1107e540 100644 --- a/src/python-common/ceph/deployment/translate.py +++ b/src/python-common/ceph/deployment/translate.py @@ -91,7 +91,7 @@ class to_ceph_volume(object): cmd += " --osds-per-device {}".format(self.spec.osds_per_device) if reclaimed_ids: - cmd += " --osd-id {}".format(" ".join(reclaimed_ids)) + cmd += " --osd-ids {}".format(" ".join(reclaimed_ids)) cmd += " --yes" cmd += " --no-systemd" diff --git a/src/python-common/ceph/tests/test_drive_group.py b/src/python-common/ceph/tests/test_drive_group.py index 647129a312af2..7cfbf85da048d 100644 --- a/src/python-common/ceph/tests/test_drive_group.py +++ b/src/python-common/ceph/tests/test_drive_group.py @@ -180,4 +180,4 @@ def test_ceph_volume_command_7(): inventory = _mk_inventory(_mk_device(rotational=True)*2) sel = drive_selection.DriveSelection(spec, inventory) cmd = translate.to_ceph_volume(spec, sel, 'host1').run() - assert cmd == 'lvm batch --no-auto /dev/sda /dev/sdb --osd-id 0 1 --yes --no-systemd' + assert cmd == 'lvm batch --no-auto /dev/sda /dev/sdb --osd-ids 0 1 --yes --no-systemd' -- 2.39.5