glance/neutron: drop nbproc and add nbthread support
Change-Id: I42f9f182a2dab8563008e8b817ac58a69b72b062
This commit is contained in:
parent
b230858fb4
commit
30fce65b2a
@ -270,8 +270,8 @@ syslog_server: "{{ api_interface_address }}"
|
|||||||
syslog_glance_tls_proxy_facility: "local2"
|
syslog_glance_tls_proxy_facility: "local2"
|
||||||
|
|
||||||
glance_tls_proxy_max_connections: 40000
|
glance_tls_proxy_max_connections: 40000
|
||||||
glance_tls_proxy_processes: 1
|
glance_tls_proxy_threads: 1
|
||||||
glance_tls_proxy_process_cpu_map: "no"
|
glance_tls_proxy_thread_cpu_map: "no"
|
||||||
glance_tls_proxy_defaults_max_connections: 10000
|
glance_tls_proxy_defaults_max_connections: 10000
|
||||||
|
|
||||||
# Glance TLS proxy timeout values
|
# Glance TLS proxy timeout values
|
||||||
|
@ -6,11 +6,9 @@ global
|
|||||||
daemon
|
daemon
|
||||||
log {{ syslog_server }}:{{ syslog_udp_port }} {{ syslog_glance_tls_proxy_facility }}
|
log {{ syslog_server }}:{{ syslog_udp_port }} {{ syslog_glance_tls_proxy_facility }}
|
||||||
maxconn {{ glance_tls_proxy_max_connections }}
|
maxconn {{ glance_tls_proxy_max_connections }}
|
||||||
nbproc {{ glance_tls_proxy_processes }}
|
nbthread {{ glance_tls_proxy_threads }}
|
||||||
{% if (glance_tls_proxy_processes | int > 1) and (glance_tls_proxy_process_cpu_map | bool) %}
|
{% if (glance_tls_proxy_threads | int > 1) and (glance_tls_proxy_thread_cpu_map | bool) %}
|
||||||
{% for cpu_idx in range(0, glance_tls_proxy_processes) %}
|
cpu-map auto:1/all 0-63
|
||||||
cpu-map {{ cpu_idx + 1 }} {{ cpu_idx }}
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
ssl-default-bind-ciphers DEFAULT:!MEDIUM:!3DES
|
ssl-default-bind-ciphers DEFAULT:!MEDIUM:!3DES
|
||||||
ssl-default-bind-options no-sslv3 no-tlsv10 no-tlsv11
|
ssl-default-bind-options no-sslv3 no-tlsv10 no-tlsv11
|
||||||
|
@ -899,8 +899,8 @@ syslog_server: "{{ api_interface_address }}"
|
|||||||
syslog_neutron_tls_proxy_facility: "local4"
|
syslog_neutron_tls_proxy_facility: "local4"
|
||||||
|
|
||||||
neutron_tls_proxy_max_connections: 40000
|
neutron_tls_proxy_max_connections: 40000
|
||||||
neutron_tls_proxy_processes: 1
|
neutron_tls_proxy_threads: 1
|
||||||
neutron_tls_proxy_process_cpu_map: "no"
|
neutron_tls_proxy_thread_cpu_map: "no"
|
||||||
neutron_tls_proxy_defaults_max_connections: 10000
|
neutron_tls_proxy_defaults_max_connections: 10000
|
||||||
neutron_tls_proxy_http_request_timeout: "10s"
|
neutron_tls_proxy_http_request_timeout: "10s"
|
||||||
neutron_tls_proxy_http_keep_alive_timeout: "10s"
|
neutron_tls_proxy_http_keep_alive_timeout: "10s"
|
||||||
|
@ -6,11 +6,9 @@ global
|
|||||||
daemon
|
daemon
|
||||||
log {{ syslog_server }}:{{ syslog_udp_port }} {{ syslog_neutron_tls_proxy_facility }}
|
log {{ syslog_server }}:{{ syslog_udp_port }} {{ syslog_neutron_tls_proxy_facility }}
|
||||||
maxconn {{ neutron_tls_proxy_max_connections }}
|
maxconn {{ neutron_tls_proxy_max_connections }}
|
||||||
nbproc {{ neutron_tls_proxy_processes }}
|
nbthread {{ neutron_tls_proxy_threads }}
|
||||||
{% if (neutron_tls_proxy_processes | int > 1) and (neutron_tls_proxy_process_cpu_map | bool) %}
|
{% if (neutron_tls_proxy_threads | int > 1) and (neutron_tls_proxy_thread_cpu_map | bool) %}
|
||||||
{% for cpu_idx in range(0, neutron_tls_proxy_processes) %}
|
cpu-map auto:1/all 0-63
|
||||||
cpu-map {{ cpu_idx + 1 }} {{ cpu_idx }}
|
|
||||||
{% endfor %}
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
ssl-default-bind-ciphers DEFAULT:!MEDIUM:!3DES
|
ssl-default-bind-ciphers DEFAULT:!MEDIUM:!3DES
|
||||||
ssl-default-bind-options no-sslv3 no-tlsv10 no-tlsv11
|
ssl-default-bind-options no-sslv3 no-tlsv10 no-tlsv11
|
||||||
|
@ -4,4 +4,8 @@ upgrade:
|
|||||||
Configuring HAProxy nbproc setting via ``haproxy_processes`` and
|
Configuring HAProxy nbproc setting via ``haproxy_processes`` and
|
||||||
``haproxy_process_cpu_map`` variables has been dropped since
|
``haproxy_process_cpu_map`` variables has been dropped since
|
||||||
threads are the recommended way to scale CPU performance since 1.8.
|
threads are the recommended way to scale CPU performance since 1.8.
|
||||||
Please use ``haproxy_threads`` and ``haproxy_thread_cpu_map`` instead.
|
This covers ``haproxy``, ``glance-tls-proxy`` and ``neutron-tls-proxy``.
|
||||||
|
Please use ``haproxy_threads`` and ``haproxy_thread_cpu_map`` instead
|
||||||
|
(or ``glance_tls_proxy_threads`` and ``glance_tls_proxy_thread_cpu_map``
|
||||||
|
for Glance TLS proxy and ``neutron_tls_proxy_threads`` and
|
||||||
|
``neutron_tls_proxy_thread_cpu_map`` for Neutron TLS proxy).
|
||||||
|
Loading…
Reference in New Issue
Block a user