]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm/ingress: make frontend stat bind on localhost 45014/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Fri, 11 Feb 2022 16:39:18 +0000 (17:39 +0100)
committerGuillaume Abrioux <gabrioux@redhat.com>
Mon, 14 Feb 2022 14:27:09 +0000 (15:27 +0100)
The current configuration of keepalived makes it do
a curl on localhost:9999 in order to check the endpoint is alive.
Given the endpoint only binds on the vip addr, that doesn't work.

Fixes: https://tracker.ceph.com/issues/53807
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
src/pybind/mgr/cephadm/tests/test_services.py

index 137dc1157edf94e46a0ea16c8d4dd2e96e9cda3c..cb84f1d072226f3a55d37a62795d3dcd2d31884a 100644 (file)
@@ -48,6 +48,7 @@ defaults
 frontend stats
     mode http
     bind {{ ip }}:{{ monitor_port }}
+    bind localhost:{{ monitor_port }}
     stats enable
     stats uri /stats
     stats refresh 10s
index 71a1307ac400ab47a673607abc89b92de2f8cf97..6f0f81c03b21acacf1c6687cbaca5c05e439bb6b 100644 (file)
@@ -759,6 +759,7 @@ class TestIngressService:
                                 '\nfrontend stats\n    '
                                 'mode http\n    '
                                 'bind 1.2.3.4:8999\n    '
+                                'bind localhost:8999\n    '
                                 'stats enable\n    '
                                 'stats uri /stats\n    '
                                 'stats refresh 10s\n    '