From 608c0de905fe6e835c4da7896d9d4da95ce57f74 Mon Sep 17 00:00:00 2001 From: Bernard Landon Date: Thu, 13 Mar 2025 11:04:42 +0000 Subject: [PATCH] src/pybind/mgr/cephadm/service_discovery: fixed HAProxy labels Fixes: https://tracker.ceph.com/issues/70477 Signed-off-by: Bernard Landon --- src/pybind/mgr/cephadm/service_discovery.py | 2 +- src/pybind/mgr/cephadm/tests/test_service_discovery.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/service_discovery.py b/src/pybind/mgr/cephadm/service_discovery.py index 867a5ff39f12b..31e8423725a3d 100644 --- a/src/pybind/mgr/cephadm/service_discovery.py +++ b/src/pybind/mgr/cephadm/service_discovery.py @@ -228,7 +228,7 @@ class Root(Server): addr = self.mgr.inventory.get_addr(dd.hostname) srv_entries.append({ 'targets': [f"{build_url(host=addr, port=spec.monitor_port).lstrip('/')}"], - 'labels': {'instance': dd.service_name()} + 'labels': {'ingress': dd.service_name(), 'instance': dd.hostname} }) return srv_entries diff --git a/src/pybind/mgr/cephadm/tests/test_service_discovery.py b/src/pybind/mgr/cephadm/tests/test_service_discovery.py index d1203c54c04eb..7723b2c1aae62 100644 --- a/src/pybind/mgr/cephadm/tests/test_service_discovery.py +++ b/src/pybind/mgr/cephadm/tests/test_service_discovery.py @@ -170,7 +170,8 @@ class TestServiceDiscovery: # check content assert cfg[0]['targets'] == ['1.2.3.4:9049'] - assert cfg[0]['labels'] == {'instance': 'ingress'} + assert cfg[0]['labels'] == {'instance': 'node0', 'ingress': 'ingress'} + assert cfg[1]['labels'] == {'instance': 'node1', 'ingress': 'ingress'} def test_get_sd_config_ceph_exporter(self): mgr = FakeMgr() -- 2.39.5