]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #39979 into master
authorSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 18:49:24 +0000 (14:49 -0400)
committerSage Weil <sage@newdream.net>
Mon, 15 Mar 2021 18:49:24 +0000 (14:49 -0400)
commit91b741b4bc68f8644d6a497ee0048e9085d7c79f
tree8e631f329054e4b899682c6aa904b18330479fce
parentb788fc14b36ffdae15ad9e6ff997406583d1d8e5
parent2904c5ece0e6d3cabaf16b2e977bdcdf5d8f68dd
Merge PR #39979 into master

* refs/pull/39979/head:
python-common: fix PlacementSpec target size method
python-common: count-per-host must be combined with label or hosts or host_pattern
mgr/cephadm: handle bare 'count-per-host:NNN', fix comments
mgr/cephadm/schedule: remove Scheduler abstraction (for now at least)
mgr/cephadm/schedule: calculate additions/removals in place()
mgr/cephadm/schedule: allow colocation of certain daemon types
mgr/cephadm/schedule: shuffle candidates, not final placements
mgr/cephadm/schedule: pass per-type allow_colo to the scheduler
mgr/cephadm/services/cephadmservice: fix typo
mgr/cephadm/schedule: pass daemons, not get_daemons_func
mgr/cephadm: use local var
mgr/cephadm/schedule: move host filtering into get_candidates()
python-common/ceph/deployment/service_spec: disallow max-per-host + explicit placement
mgr/cephadm/schedule: respect count-per-host
mgr/cephadm: adjust deployment logic to allow multiple daemons per host
python-common: add count-per-host to PlacementSpec
mgr/cephadm: do not worry about even # of monitors

Reviewed-by: Juan Miguel Olmo <jolmomar@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/services/cephadmservice.py
src/python-common/ceph/deployment/service_spec.py