openstack
/
octavia
Code Issues Proposed changes

Merge "Fix TLS-HELLO healthmonitors in the amphora-driver"

This commit is contained in:
Zuul 2023-11-30 00:46:54 +00:00 committed by Gerrit Code Review
parent 20bbafa0a6 8e7c2737b6
commit 57e494c4be
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
octavia/common/jinja/haproxy/combined_listeners/templates/macros.j2
View File

@ -375,9 +375,6 @@ backend {{ pool.id }}:{{ listener.id }}
option httpchk {{ pool.health_monitor.http_method }} {{ pool.health_monitor.url_path }}
{% endif %}
http-check expect rstatus {{ pool.health_monitor.expected_codes }}
{% endif %}
{% if pool.health_monitor.type == constants.HEALTH_MONITOR_TLS_HELLO %}
option ssl-hello-chk
{% endif %}
{% if pool.health_monitor.type == constants.HEALTH_MONITOR_PING %}
option external-check

1
octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py
View File

@ -813,7 +813,6 @@ class TestHaproxyCfg(base.TestCase):
" balance roundrobin\n"
" cookie SRV insert indirect nocache\n"
" timeout check 31s\n"
" option ssl-hello-chk\n"
" fullconn {maxconn}\n"
" option allbackups\n"
" timeout connect 5000\n"

4
releasenotes/notes/fix-tls-hello-healthmonitors-a4b98a80f6de8394.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- |
Fixed TLS-HELLO health-monitors in the amphora-driver.