Merge "Expose the zaqar_ws_timeout_tunnel variable." into stable/ussuri
This commit is contained in:
commit
cf1739be2d
|
@ -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:
|
||||
puppet_debug_enabled: {get_param: ConfigDebug}
|
||||
|
@ -178,6 +182,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:
|
||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue