]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
mgr/cephadm: fix placement with label and host pattern 56088/head
authorAdam King <adking@redhat.com>
Wed, 14 Feb 2024 16:28:11 +0000 (11:28 -0500)
committerAdam King <adking@redhat.com>
Sun, 10 Mar 2024 19:23:42 +0000 (15:23 -0400)
commit2ec90ba023e2ed3bf095c55c08a751abdb6bf4f9
tree9b6df01a644004fa01b96381f263cb60d367c1d9
parent5bee1087985ebe9d721cdeeb2ee8183e5cf42d59
mgr/cephadm: fix placement with label and host pattern

Previously, when both the label and host pattern were
provided, only the label was actually used for the placement

Fixes: https://tracker.ceph.com/issues/64428
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 106f34ba31c82dd87f4c3f9ad82d8ace81e6c689)
src/pybind/mgr/cephadm/schedule.py
src/pybind/mgr/cephadm/tests/test_scheduling.py
src/python-common/ceph/deployment/service_spec.py