openstack
/
puppet-tripleo
Code Issues Proposed changes

Allow the Mistral tunnel timeout to be configurable. 

Change-Id: Ibfd5587476d5a411206f62e8b4b886db662bf7d1
Related-Bug:  #1872823
Signed-off-by: Luke Short <ekultails@gmail.com>
(cherry picked from commit 5c3e736e40)
This commit is contained in:
Luke Short 2020-05-18 14:06:47 -04:00
parent 658956db22
commit 9bd8331053
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/haproxy.pp
View File

@ -537,6 +537,10 @@
# (optional) Specify the network zaqar_api is running on.
# Defaults to hiera('zaqar_api_network', undef)
#
# [*zaqar_ws_timeout_tunnel*]
# (optional) Specify the tunnel timeout in seconds for the Zaqar API.
# Defaults to hiera('zaqar_ws_timeout_tunnel', '14400')
#
# [*service_ports*]
# (optional) Hash that contains the values to override from the service ports
# The available keys to modify the services' ports are:
@ -732,6 +736,7 @@ class tripleo::haproxy (
$swift_proxy_server_network = hiera('swift_proxy_network', undef),
$trove_network = hiera('trove_api_network', undef),
$zaqar_api_network = hiera('zaqar_api_network', undef),
$zaqar_ws_timeout_tunnel = hiera('zaqar_ws_timeout_tunnel', '14400'),
$service_ports = {}
) {
$default_service_ports = {
@ -1674,7 +1679,7 @@ class tripleo::haproxy (
# timeouts get overridden by others at certain times of the connection.
# The following values were taken from the following site:
# http://blog.haproxy.com/2012/11/07/websockets-load-balancing-with-haproxy/
'timeout' => ['connect 5s', 'client 25s', 'server 25s', 'tunnel 14400s'],
'timeout' => ['connect 5s', 'client 25s', 'server 25s', regsubst('tunnel Xs', 'X', $zaqar_ws_timeout_tunnel)],
},
public_ssl_port => $ports[zaqar_ws_ssl_port],
service_network => $zaqar_api_network,