From: Joshua Schmid <jschmid@suse.de>
Date: Wed, 1 Apr 2020 14:26:33 +0000 (+0200)
Subject: mgr/cephadm: use --osd-ids instead of --osd-id
X-Git-Tag: v16.1.0~2580^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fa88483f660f2bf79d1c1ca77d7104b3a42ed05d;p=ceph.git

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

Signed-off-by: Joshua Schmid <jschmid@suse.de>
---

diff --git a/src/python-common/ceph/deployment/translate.py b/src/python-common/ceph/deployment/translate.py
index be2cde200778..6f0fd1107e54 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 647129a312af..7cfbf85da048 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'