x
/
fuel-plugin-contrail
Code Issues Proposed changes

Remove nolinger option from HAProxy config 

HAProxy nolinger option conflicts with forceclose, which resulted in
connection reset

Closes-bug: #1644608
Change-Id: I45ebfb96f1423bf33c056f30f745966149143884
Signed-off-by: Illia Polliul <ipolliul@mirantis.com>
This commit is contained in:
Illia Polliul 2017-01-13 18:34:32 +02:00
parent ca8bb999e2
commit 65e97aa29a
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
deployment_scripts/puppet/modules/contrail/manifests/vip.pp
View File

@ -35,7 +35,7 @@ class contrail::vip {
ipaddresses => $contrail::contrail_analytics_ips,
public => true,
internal => true,
haproxy_config_options => { 'option' => ['nolinger', 'tcp-check'],
haproxy_config_options => { 'option' => ['httplog','tcp-check'],
'balance' => 'roundrobin',
'tcp-check' => 'connect port 6379',
'default-server' => 'error-limit 1 on-error mark-down' },
@ -50,7 +50,7 @@ class contrail::vip {
ipaddresses => $contrail::contrail_controller_ips,
public => false,
internal => true,
haproxy_config_options => { 'option' => 'nolinger',
haproxy_config_options => { 'option' => 'httplog',
'balance' => 'roundrobin',
'timeout' => ['server 3m', 'client 3m'] },
balancermember_options => 'check inter 2000 rise 2 fall 3',
@ -66,7 +66,7 @@ class contrail::vip {
internal => false,
public_ssl => $contrail::public_ssl,
public_ssl_path => $contrail::public_ssl_path,
haproxy_config_options => { 'option' => 'nolinger',
haproxy_config_options => { 'option' => 'httplog',
'balance' => 'roundrobin',
'timeout' => ['server 3m', 'client 3m'] },
balancermember_options => 'check inter 2000 rise 2 fall 3',
@ -80,7 +80,7 @@ class contrail::vip {
ipaddresses => $contrail::contrail_controller_ips,
public => false,
internal => true,
haproxy_config_options => { 'option' => 'nolinger',
haproxy_config_options => { 'option' => 'httplog',
'balance' => 'roundrobin' },
balancermember_options => 'check inter 2000 rise 2 fall 3',
}
@ -95,7 +95,7 @@ class contrail::vip {
internal => false,
public_ssl => $contrail::public_ssl,
public_ssl_path => $contrail::public_ssl_path,
haproxy_config_options => { 'option' => ['nolinger', 'tcp-check'],
haproxy_config_options => { 'option' => ['httplog', 'tcp-check'],
'balance' => 'source',
'tcp-check' => "connect port ${ui_backend_port}",
'default-server' => 'error-limit 1 on-error mark-down',
@ -129,7 +129,7 @@ class contrail::vip {
ipaddresses => $contrail::rabbit_ips,
public => false,
internal => true,
haproxy_config_options => { 'option' => ['tcplog', 'redispatch','tcpka'],
haproxy_config_options => { 'option' => ['httplog', 'tcplog', 'redispatch','tcpka'],
'balance' => 'roundrobin',
'timeout' => ['connect 5000', 'client 24h', 'server 24h'],
'mode' => 'tcp',