From 4e7e694fa53c29ff1552656c892bee592d5db871 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 18 Dec 2019 08:13:55 -0600 Subject: [PATCH] raw: --osd-fsid throughout Signed-off-by: Sage Weil --- src/ceph-volume/ceph_volume/devices/raw/activate.py | 8 ++++---- src/ceph-volume/ceph_volume/devices/raw/common.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/raw/activate.py b/src/ceph-volume/ceph_volume/devices/raw/activate.py index 743df16eca7..90ba8c0b079 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/activate.py +++ b/src/ceph-volume/ceph_volume/devices/raw/activate.py @@ -98,7 +98,7 @@ class Activate(object): device label (normally the first block of the device). ceph-volume raw activate --device /dev/sdb - ceph-volume raw activate --osd-id 1 --osd-uuid f0327efd-c28e-40bb-9199-f2e61e54c12a + ceph-volume raw activate --osd-id 1 --osd-fsid f0327efd-c28e-40bb-9199-f2e61e54c12a The device(s) associated with the OSD needs to have been prepared previously, so that all needed tags and metadata exist. @@ -114,7 +114,7 @@ class Activate(object): help='The ID of the OSD, usually an integer, like 0' ) parser.add_argument( - '--osd-uuid', + '--osd-fsid', help='The UUID of the OSD' ) parser.add_argument( @@ -142,8 +142,8 @@ class Activate(object): return args = parser.parse_args(self.argv) self.args = args - if not args.device and not args.activate_all and not (args.osd_id and args.osd_uuid): - terminal.error('must specify one of --device, --activate-all, or --osd-id and --osd-uuid') + if not args.device and not args.activate_all and not (args.osd_id and args.osd_fsid): + terminal.error('must specify one of --device, --activate-all, or --osd-id and --osd-fsid') raise SystemExit(1) if not args.no_systemd: terminal.error('systemd support not yet implemented') diff --git a/src/ceph-volume/ceph_volume/devices/raw/common.py b/src/ceph-volume/ceph_volume/devices/raw/common.py index ca7f8612c1c..03b6cd690ed 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/common.py +++ b/src/ceph-volume/ceph_volume/devices/raw/common.py @@ -31,7 +31,7 @@ def create_parser(prog, description): help='Reuse an existing OSD id', ) parser.add_argument( - '--osd-uuid', + '--osd-fsid', help='Reuse an existing OSD UUID', ) parser.add_argument( -- 2.39.5