Merge "loadbalancer: support setting nbthread with variable haproxy_threads"

ansible/roles/loadbalancer/defaults/main.yml

@@ -51,6 +51,8 @@ keepalived_traffic_mode: "multicast"
 
 # Extended global configuration, optimization options.
 haproxy_max_connections: 40000
+haproxy_threads: 1
+# More than 1 process is deprecated by HAProxy, prefer haproxy_threads
 haproxy_processes: 1
 haproxy_process_cpu_map: "no"
 # Matches the mariadb 10000 max connections limit

ansible/roles/loadbalancer/templates/haproxy/haproxy_main.cfg.j2

@@ -7,6 +7,7 @@ global
     log {{ syslog_server }}:{{ syslog_udp_port }} {{ syslog_haproxy_facility }}
     maxconn {{ haproxy_max_connections }}
     nbproc {{ haproxy_processes }}
+    nbthread {{ haproxy_threads }}
     {% if (haproxy_processes | int > 1) and (haproxy_process_cpu_map | bool) %}
         {% for cpu_idx in range(0, haproxy_processes) %}
     cpu-map {{ cpu_idx + 1 }} {{ cpu_idx }}

releasenotes/notes/haproxy-nbthread-7680f1be54eeb365.yaml

+---
+features:
+  - |
+    HAProxy supports setting nbthread via variable haproxy_threads.
+    Threads are recommended instead of processes since HAProxy 1.8.
+    They cannot be used both at the same time.