From cc023aa3410123a1e9a009c291ef79187d139a63 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Wed, 23 Aug 2017 11:55:45 -0400 Subject: [PATCH] ceph-volume lvm.prepare update docstring for vg/lv usage Signed-off-by: Alfredo Deza --- .../ceph_volume/devices/lvm/prepare.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py index bd84aab18e34a..63030e6b44403 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py @@ -75,7 +75,6 @@ class Prepare(object): cluster_fsid = conf.ceph.get('global', 'fsid') fsid = args.osd_fsid or system.generate_uuid() - #osd_id = args.osd_id or prepare_utils.create_id(fsid) # allow re-using an id, in case a prepare failed osd_id = args.osd_id or prepare_utils.create_id(fsid, json.dumps(secrets)) journal_name = "journal_%s" % fsid @@ -167,28 +166,18 @@ class Prepare(object): Once the OSD is ready, an ad-hoc systemd unit will be enabled so that it can later get activated and the OSD daemon can get started. - Most basic Usage looks like (journal will be collocated from the same volume group): - - ceph-volume lvm prepare --data {volume group name} - - Example calls for supported scenarios: - Dedicated volume group for Journal(s) - ------------------------------------- + Filestore + --------- Existing logical volume (lv) or device: - ceph-volume lvm prepare --data {logical volume} --journal /path/to/{lv}|{device} + ceph-volume lvm prepare --filestore --data {vg name/lv name} --journal /path/to/device Or: - ceph-volume lvm prepare --data {data volume group} --journal {journal volume group} - - Collocated (same group) for data and journal - -------------------------------------------- - - ceph-volume lvm prepare --data {volume group} + ceph-volume lvm prepare --filestore --data {vg name/lv name} --journal {vg name/lv name} """) parser = prepare_parser( -- 2.39.5