src/pybind/mgr/cephadm/service_discovery: fixed HAProxy labels

Fixes: https://tracker.ceph.com/issues/70477
Signed-off-by: Bernard Landon <bernard@lndn.ch>

diff --git a/src/pybind/mgr/cephadm/service_discovery.py b/src/pybind/mgr/cephadm/service_discovery.py
index 867a5ff39f12bd7bcf9323637c95164f45c4c4ed..31e8423725a3d4082f064e56d29f96b9b8b822f0 100644 (file)
--- 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 d1203c54c04eb4ffd8609ea807cd07d2a751f6bb..7723b2c1aae628728a2acaa4166923c37246a559 100644 (file)
--- 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()