Merge pull request ceph#52422 from guits/cv-add-raw-osd-id-param

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

Author: guits

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

src/ceph-volume/ceph_volume/devices/raw/prepare.py

@@ -122,7 +122,9 @@ def prepare(self):
 
         # 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,