]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #39550 into master
authorSage Weil <sage@newdream.net>
Thu, 13 May 2021 13:57:14 +0000 (09:57 -0400)
committerSage Weil <sage@newdream.net>
Thu, 13 May 2021 13:57:14 +0000 (09:57 -0400)
* 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>
1  2 
src/common/options/global.yaml.in
src/pybind/mgr/cephadm/inventory.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/orchestrator/module.py

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge