import ceph quincy 17.2.6

[ceph.git] / ceph / src / pybind / mgr / cephadm / templates / services / ingress / haproxy.cfg.j2

diff --git a/ceph/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2 b/ceph/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
index cb84f1d072226f3a55d37a62795d3dcd2d31884a..6d64c63634587a5e4f23cad2ac7b7979e5462838 100644 (file)
--- a/ceph/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
+++ b/ceph/src/pybind/mgr/cephadm/templates/services/ingress/haproxy.cfg.j2
@@ -32,8 +32,8 @@ defaults
     timeout connect         5s
     timeout http-request    1s
     timeout http-keep-alive 5s
-    timeout client          1s
-    timeout server          1s
+    timeout client          30s
+    timeout server          30s
     timeout check           5s
 {% endif %}
 {% if mode == 'tcp' %}
@@ -67,6 +67,10 @@ frontend frontend
 backend backend
 {% if mode == 'http' %}
     option forwardfor
+{% if backend_spec.ssl %}
+    default-server ssl
+    default-server verify none
+{% endif %}
     balance static-rr
     option httpchk HEAD / HTTP/1.0
     {% for server in servers %}