Merge pull request ceph#53840 from rhcs-dashboard/add-health-check-haproxy

mgr/cephadm is not defining haproxy tcp healthchecks for Ganesha

Reviewed-by: Adam King <[email protected]>

Author: adk3798

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 %}

src/pybind/mgr/cephadm/tests/test_services.py

@@ -1650,7 +1650,7 @@ def fake_get_addr(hostname: str) -> str:
         )
         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}
         }
@@ -2428,7 +2428,7 @@ def fake_keys():
             '    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}