openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Expose the zaqar_ws_timeout_tunnel variable."

This commit is contained in:
Zuul 2020-06-12 04:36:32 +00:00 committed by Gerrit Code Review
parent d118b15983 d3207d8a60
commit 1f6a16a543
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -108,6 +108,10 @@ parameters:
default: '/etc/pki/CA/crl/'
type: string
description: The directory of the CRL PEM file to be mounted.
ZaqarWsTimeout:
default: '14400'
type: string
description: The tunnel timeout in seconds for the Zaqar API.
conditions:
internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
@ -177,6 +181,7 @@ outputs:
tripleo::haproxy::redis_password: {get_param: RedisPassword}
tripleo::haproxy::crl_file: {get_param: InternalTLSCRLPEMFile}
tripleo::haproxy::haproxy_stats: {get_param: HAProxyStatsEnabled}
tripleo::haproxy::zaqar_ws_timeout_tunnel: {get_param: ZaqarWsTimeout}
enable_load_balancer: {get_param: EnableLoadBalancer}
tripleo::profile::base::haproxy::certificates_specs:
map_merge:

7
releasenotes/notes/zaqar_ws_timeout_tunnel-d5d1e900dce79b34.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
A new Heat parameter 'ZaqarWsTimeout' exposes the Puppet variable
'tripleo::haproxy::zaqar_ws_timeout_tunnel'. This allows operators
to configure the Mistral API timeout. It currently defaults to four
hours.