Merge default_listen with swift_proxy_server_listen_options
Currently haproxy for swift doesn't have default setting. This generates config such as listen swift_proxy_server bind 10.0.0.5:13808 transparent ssl crt /etc/pki/tls/private/overcloud_endpoint.pem bind 172.16.1.4:8080 transparent option httpchk GET /healthcheck timeout client 2m timeout server 2m server overcloud-controller-0.storage.localdomain 172.16.1.10:8080 check fall 5 inter 2000 rise 2 without http-request set-header X-Forwarded-Proto https if { ssl_fc } http-request set-header X-Forwarded-Proto http if !{ ssl_fc } option httplog This makes really hard to debug in case of issues. This patch merges default_listen_options with swift to have config which is more reliable for debugging Closes-Bug: #1764731 Change-Id: I6716499b4a10f3ba39db33d6468c261c58ee373d
This commit is contained in:
parent
6d51054796
commit
c5131729e7
|
@ -1188,7 +1188,7 @@ class tripleo::haproxy (
|
||||||
service_port => $ports[swift_proxy_port],
|
service_port => $ports[swift_proxy_port],
|
||||||
ip_addresses => hiera('swift_proxy_node_ips', $controller_hosts_real),
|
ip_addresses => hiera('swift_proxy_node_ips', $controller_hosts_real),
|
||||||
server_names => hiera('swift_proxy_node_names', $controller_hosts_names_real),
|
server_names => hiera('swift_proxy_node_names', $controller_hosts_names_real),
|
||||||
listen_options => $swift_proxy_server_listen_options,
|
listen_options => merge($default_listen_options, $swift_proxy_server_listen_options),
|
||||||
public_ssl_port => $ports[swift_proxy_ssl_port],
|
public_ssl_port => $ports[swift_proxy_ssl_port],
|
||||||
service_network => $swift_proxy_server_network,
|
service_network => $swift_proxy_server_network,
|
||||||
member_options => union($haproxy_member_options, $internal_tls_member_options),
|
member_options => union($haproxy_member_options, $internal_tls_member_options),
|
||||||
|
|
Loading…
Reference in New Issue