ceph-volume: add --osd-id option to raw prepare

This adds the support of the --osd-id option to the raw prepare command.

Fixes: https://tracker.ceph.com/issues/61995
Signed-off-by: Guillaume Abrioux <gabrioux@ibm.com>
(cherry picked from commit 16729656aa208deeedd631dcf871d501d6eba7f5)

diff --git a/src/ceph-volume/ceph_volume/devices/raw/common.py b/src/ceph-volume/ceph_volume/devices/raw/common.py
index 19de81fe5ef8a4c7d4dd37a3ea58f2b14942c5c3..89ee285be5b423e6a1d3b3d1a32efbdbf6a735b1 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/raw/common.py
+++ b/src/ceph-volume/ceph_volume/devices/raw/common.py
@@ -49,4 +49,10 @@ def create_parser(prog, description):
         action='store_true',
         help='Enable device encryption via dm-crypt',
     )
+    parser.add_argument(
+        '--osd-id',
+        help='Reuse an existing OSD id',
+        default=None,
+        type=arg_validators.valid_osd_id,
+    )
     return parser

diff --git a/src/ceph-volume/ceph_volume/devices/raw/prepare.py b/src/ceph-volume/ceph_volume/devices/raw/prepare.py
index 3c96eedacf34a6d6f30d7ce09eceeb595016092f..0f18c764778ba70b50d0acb187d0670eb7474f48 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/raw/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/raw/prepare.py
@@ -122,7 +122,9 @@ class Prepare(object):
 
         # reuse a given ID if it exists, otherwise create a new ID
         self.osd_id = prepare_utils.create_id(
-            osd_fsid, json.dumps(secrets))
+            osd_fsid,
+            json.dumps(secrets),
+            osd_id=self.args.osd_id)
 
         prepare_bluestore(
             self.args.data,