From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Nov 2021 21:14:19 +0000 (-0400)
Subject: Merge PR #42727 into master
X-Git-Tag: v17.1.0~502
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b90c0374570417f74fd22beba3bd97a4e5c92047;p=ceph.git

Merge PR #42727 into master

* 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>
---

b90c0374570417f74fd22beba3bd97a4e5c92047