From: Sage Weil Date: Mon, 15 Mar 2021 18:49:24 +0000 (-0400) Subject: Merge PR #39979 into master X-Git-Tag: v17.1.0~2613 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=91b741b4bc68f8644d6a497ee0048e9085d7c79f;p=ceph.git 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 Reviewed-by: Sebastian Wagner --- 91b741b4bc68f8644d6a497ee0048e9085d7c79f