From: Sage Weil <sage@newdream.net>
Date: Thu, 13 May 2021 13:57:14 +0000 (-0400)
Subject: Merge PR #39550 into master
X-Git-Tag: v17.1.0~1976
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=beb57679c62e9a35f1f9c671438eb9dd87b172f2;p=ceph-ci.git

Merge PR #39550 into master

* refs/pull/39550/head:
	mgr/cephadm: induce retune of osd memory on osd creation
	qa/tasks/cephadm.conf: autotune osd memory by default
	mgr/cephadm: do not autotune when _no_autotune_memory label is present
	mgr/cephadm: autotune osd memory
	common: add osd_memory_target_autotune
	mgr/cephadm: report memory usage, request (limit) in 'orch ps'
	doc/cephadm/host-management: document _admin group
	mgr/orchestrator: fix help formatting

Reviewed-by: Adam King <adking@redhat.com>
---

beb57679c62e9a35f1f9c671438eb9dd87b172f2