From: John Mulligan Date: Tue, 21 Mar 2023 15:42:25 +0000 (-0400) Subject: mgr/cephadm: add support for default server options to template X-Git-Tag: v19.0.0~1098^2~11 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9613181e286f2e11574d8240d531c592a2196881;p=ceph-ci.git mgr/cephadm: add support for default server options to template Add support for default server-options within the haproxy backend section. This change will later be used to enable haproxy proxy protocol (v2) support. Signed-off-by: John Mulligan --- 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 a529798e739..100acce401b 100644 --- a/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 +++ b/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 @@ -81,6 +81,9 @@ backend backend mode tcp balance source hash-type consistent +{% if default_server_opts %} + default-server {{ default_server_opts|join(" ") }} +{% endif %} {% for server in servers %} server {{ server.name }} {{ server.ip }}:{{ server.port }} {% endfor %}