Don't restrict haproxy tunable options

openstack/openstack-ansible-haproxy_server

Code Issues Proposed changes

Instead of hardcoding specific supported tunable options, we
just pass key as an option to haproxy config.
This change might break deployments during upgrades, since format of
values in variable has changed, but appropriate release note was written
We also increase maxrewrite by default, as otherwise usage of CSP leads
to 500 error.
Change-Id: I949960420ed5dbd6d58f0de7dae0ac629a85b7fc
Related-Bug: https://github.com/haproxy/haproxy/issues/1597
Needed-By: https://review.opendev.org/c/openstack/openstack-ansible-os_horizon/+/844815

This commit is contained in:

Dmitriy Rabotyagov

2022年06月18日 21:05:25 +02:00

parent 8a81b355d8

commit be9a66c280

4 changed files with 37 additions and 17 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

13
templates/haproxy.cfg.j2

View File

@@ -7,16 +7,9 @@ global

group haproxy

daemon

maxconn {{ haproxy_maxconn }}

{% if haproxy_tuning_params is defined %}

nbproc {{ haproxy_tuning_params.nbproc | default('1') }}

tune.bufsize {{ haproxy_tuning_params.bufsize | default('384000') }}

tune.chksize {{ haproxy_tuning_params.chksize | default('16384') }}

tune.comp.maxlevel {{ haproxy_tuning_params.comp_maxlevel | default('1') }}

tune.http.maxhdr {{ haproxy_tuning_params.http_maxhdr | default('101') }}

tune.maxaccept {{ haproxy_tuning_params.maxaccept | default('64') }}

tune.ssl.cachesize {{ haproxy_tuning_params.ssl_cachesize | default('20000') }}

tune.ssl.lifetime {{ haproxy_tuning_params.ssl_lifetime | default('300') }}

{% endif %}

{% for key, value in ((_haproxy_default_tuning_params | default({})) | combine(haproxy_tuning_params)).items() %}

{{ key }} {{ value }}

{% endfor %}

stats socket /var/run/haproxy.stat level admin mode 600

{% if haproxy_stats_process is defined %}

stats bind-process {{ haproxy_stats_process }}

Don't restrict haproxy tunable options

13 templates/haproxy.cfg.j2 Unescape Escape View File

13
templates/haproxy.cfg.j2

View File