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 <jmulligan@redhat.com>
(cherry picked from commit 9613181e286f2e11574d8240d531c592a2196881)

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 a529798e739d77d4ecbe3ed3d22729901c1a1be4..100acce401ba0e2fd303556553e1812fd27c82d5 100644 (file)
--- 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 %}