]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: fix placement with label and host pattern
authorAdam King <adking@redhat.com>
Wed, 14 Feb 2024 16:28:11 +0000 (11:28 -0500)
committerAdam King <adking@redhat.com>
Tue, 19 Mar 2024 20:37:56 +0000 (16:37 -0400)
commit3cca4b3955e8b2585fae9dbc86f3a684771efe53
treec7bfa87e8050a0d5ecded352c1b8f0e7898f5c7c
parent9a60fb266b29ae8de34aab7f40debd9834be80b2
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