starlingx/stx-puppet
Code Issues Proposed changes

Merge "Update haproxy config to include keystone request retry."

Browse Source
This commit is contained in:
Zuul 2023-09-11 19:30:49 +00:00 committed by Gerrit Code Review
commit 545f251d3e
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/puppet-dcmanager/src/dcmanager/manifests/api.pp
View File

@ -95,7 +95,7 @@ class dcmanager::api (
$keystone_identity_uri = false,
$keystone_user_domain = 'Default',
$keystone_project_domain = 'Default',
$keystone_http_connect_timeout = '10',
$keystone_http_connect_timeout = '15',
$keystone_http_request_max_retries = '3',
$auth_type = 'password',
$service_port = '5000',

2
modules/puppet-dcorch/src/dcorch/manifests/api_proxy.pp
View File

@ -96,7 +96,7 @@ class dcorch::api_proxy (
$keystone_identity_uri = false,
$keystone_user_domain = 'Default',
$keystone_project_domain = 'Default',
$keystone_http_connect_timeout = '10',
$keystone_http_connect_timeout = '15',
$dcmanager_keystone_user = 'dcmanager',
$auth_type = 'password',
$service_port = '5000',

2
modules/puppet-sysinv/src/sysinv/manifests/certalarm.pp
View File

@ -26,7 +26,7 @@ class sysinv::certalarm (
$keystone_interface = 'internal',
$auth_type = 'password',
$service_port = '5000',
$keystone_http_connect_timeout = '10',
$keystone_http_connect_timeout = '15',
$package_ensure = 'latest',
$bind_host = '::',
$pxeboot_host = undef,

2
modules/puppet-sysinv/src/sysinv/manifests/certmon.pp
View File

@ -34,7 +34,7 @@ class sysinv::certmon (
$keystone_interface = 'internal',
$auth_type = 'password',
$service_port = '5000',
$keystone_http_connect_timeout = '10',
$keystone_http_connect_timeout = '15',
$package_ensure = 'latest',
$bind_host = '::',
$pxeboot_host = undef,

1
puppet-manifests/src/modules/openstack/manifests/keystone.pp
View File

@ -169,6 +169,7 @@ class openstack::keystone::haproxy
public_ip_address => $::platform::haproxy::params::private_dc_ip_address,
public_port => $api_port + 1,
private_port => $api_port,
retry_on => 'conn-failure 0rtt-rejected',
}
}
}

2
puppet-manifests/src/modules/platform/manifests/haproxy.pp
View File

@ -20,6 +20,7 @@ define platform::haproxy::proxy (
$private_ip_address = undef,
$server_timeout = undef,
$client_timeout = undef,
$retry_on = undef,
$x_forwarded_proto = true,
$enable_https = undef,
$https_ep_type = undef,
@ -145,6 +146,7 @@ define platform::haproxy::proxy (
'server' => "${server_name} ${private_ip}:${private_port}",
'timeout' => $timeout_option,
'mode' => $mode_option,
'retry-on' => $retry_on
}
}
}