From: avanthakkar <avanjohn@gmail.com>
Date: Thu, 5 Oct 2023 12:18:34 +0000 (+0530)
Subject: mgr/cephadm is not defining haproxy tcp healthchecks for Ganesha
X-Git-Tag: testing/wip-pdonnell-testing-20240430.123648-reef-debug~157^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=89d7fc20bb277db0563c6f4712997dc57df81525;p=ceph-ci.git

mgr/cephadm is not defining haproxy tcp healthchecks for Ganesha

Fixes: https://tracker.ceph.com/issues/62638
Signed-off-by: avanthakkar <avanjohn@gmail.com>
(cherry picked from commit 6a6a9ddd46e5dd2135dfd241fc0dff8ff7472a06)
---

diff --git a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
index 100acce401b..c114a8cba11 100644
--- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
+++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
@@ -85,6 +85,6 @@ backend backend
     default-server {{ default_server_opts|join(" ") }}
 {% endif %}
     {% for server in servers %}
-    server {{ server.name }} {{ server.ip }}:{{ server.port }}
+    server {{ server.name }} {{ server.ip }}:{{ server.port }} check
     {% endfor %}
 {% endif %}
diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py
index 2300b288d29..0783331410c 100644
--- a/src/pybind/mgr/cephadm/tests/test_services.py
+++ b/src/pybind/mgr/cephadm/tests/test_services.py
@@ -1633,7 +1633,7 @@ class TestIngressService:
         )
         if enable_haproxy_protocol:
             haproxy_txt += '    default-server send-proxy-v2\n'
-        haproxy_txt += '    server nfs.foo.0 192.168.122.111:12049\n'
+        haproxy_txt += '    server nfs.foo.0 192.168.122.111:12049 check\n'
         haproxy_expected_conf = {
             'files': {'haproxy.cfg': haproxy_txt}
         }
@@ -2411,7 +2411,7 @@ class TestIngressService:
             '    balance     source\n'
             '    hash-type   consistent\n'
             '    default-server send-proxy-v2\n'
-            '    server nfs.foo.0 192.168.122.111:12049\n'
+            '    server nfs.foo.0 192.168.122.111:12049 check\n'
         )
         haproxy_expected_conf = {
             'files': {'haproxy.cfg': haproxy_txt}