mgr/cephadm: use --osd-ids instead of --osd-id

Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit fa88483f660f2bf79d1c1ca77d7104b3a42ed05d)

diff --git a/src/python-common/ceph/deployment/translate.py b/src/python-common/ceph/deployment/translate.py
index be2cde20077896d6d991607d4951dc04cf13ac32..6f0fd1107e540fd45d648d821dd3b508f3ee6a3e 100644 (file)
--- 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 647129a312af23c83590da438712925f73f65de1..7cfbf85da048de638f3f526cc501a5dea79986d2 100644 (file)
--- 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'