From 525957be98a0a6ff742f6bae4450f291591f516f Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 24 Jan 2020 16:27:10 +0100 Subject: [PATCH] ceph-volume: remove osd-id and osd-fsid flag MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit These are not used since we only rely on the device path so removing them to avid confusion. Signed-off-by: Sébastien Han --- src/ceph-volume/ceph_volume/devices/raw/activate.py | 1 - src/ceph-volume/ceph_volume/devices/raw/common.py | 8 -------- src/ceph-volume/ceph_volume/devices/raw/prepare.py | 4 ++-- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/raw/activate.py b/src/ceph-volume/ceph_volume/devices/raw/activate.py index 44164c844dfe7..57fb2223d1e62 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/activate.py +++ b/src/ceph-volume/ceph_volume/devices/raw/activate.py @@ -86,7 +86,6 @@ 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-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. diff --git a/src/ceph-volume/ceph_volume/devices/raw/common.py b/src/ceph-volume/ceph_volume/devices/raw/common.py index 03b6cd690ed1a..ba1dae00f16ef 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/common.py +++ b/src/ceph-volume/ceph_volume/devices/raw/common.py @@ -26,14 +26,6 @@ def create_parser(prog, description): dest='crush_device_class', help='Crush device class to assign this OSD to', ) - parser.add_argument( - '--osd-id', - help='Reuse an existing OSD id', - ) - parser.add_argument( - '--osd-fsid', - help='Reuse an existing OSD UUID', - ) parser.add_argument( '--cluster-fsid', help='Specify the cluster fsid, useful when no ceph.conf is available', diff --git a/src/ceph-volume/ceph_volume/devices/raw/prepare.py b/src/ceph-volume/ceph_volume/devices/raw/prepare.py index 751630563737a..54e82c99202b3 100644 --- a/src/ceph-volume/ceph_volume/devices/raw/prepare.py +++ b/src/ceph-volume/ceph_volume/devices/raw/prepare.py @@ -11,7 +11,7 @@ from .common import create_parser logger = logging.getLogger(__name__) -def prepare_bluestore(block, secrets, osd_id, fsid, tmpfs): +def prepare_bluestore(block, secrets, tmpfs): """ :param block: The name of the logical volume for the bluestore data :param wal: a regular/plain disk or logical volume, to be used for block.wal @@ -77,7 +77,7 @@ class Prepare(object): @decorators.needs_root def prepare(self): secrets = {'cephx_secret': prepare_utils.create_key()} - osd_fsid = self.args.osd_fsid or system.generate_uuid() + osd_fsid = system.generate_uuid() crush_device_class = self.args.crush_device_class if crush_device_class: secrets['crush_device_class'] = crush_device_class -- 2.39.5