]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #42727 into master
authorSage Weil <sage@newdream.net>
Thu, 4 Nov 2021 21:14:19 +0000 (17:14 -0400)
committerSage Weil <sage@newdream.net>
Thu, 4 Nov 2021 21:14:19 +0000 (17:14 -0400)
* refs/pull/42727/head:
mgr/orchestrator: improve usage string for 'orch daemon add osd'
ceph-volume: activate: try simple mode too
mgr/cephadm: identify and instantiate raw osds post-create
mgr/orchestrator: accept --method arg to 'orch daemon add osd'
python-common: drivegroup: add 'method' property
cephadm: use generic ceph-volume activate
ceph-volume: top-level 'activate' command
ceph-volume: lvm activate: add --no-tmpfs
ceph-volume: lvm activate: infer bluestore or filestore
ceph-volume: raw activate: accept --osd-id and/or --osd-uuid instead of device

Reviewed-by: Sebastian Wagner <sewagner@redhat.com>
Reviewed-by: Guillaume Abrioux <gabrioux@redhat.com>
1  2 
src/cephadm/cephadm
src/pybind/mgr/cephadm/tests/test_cephadm.py

Simple merge