]> 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>
Sun, 10 Mar 2024 21:04:01 +0000 (17:04 -0400)
commit6f3dbd13605c6f84a634d8fcfbcc137b1df6a024
tree11c2e8be75e18aae25a82f14d429e400a58c4f12
parentc2ea977b6956d1f694ccf66acc692fdd979e3baa
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