openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix condition for pacemaker resource_op_defaults"

This commit is contained in:
Zuul 2021-07-29 02:16:11 +00:00 committed by Gerrit Code Review
parent 663117ce0f 74ae036024
commit 891c020b31
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
deployment/pacemaker/pacemaker-baremetal-puppet.yaml
View File

@ -108,15 +108,14 @@ parameters:
type: boolean
PacemakerBundleOperationTimeout:
type: string
default: ''
default: '120s'
description: The timeout for start, monitor and stop operations
run by the container resource agent, in seconds.
When set to default '', the timeout comes from
pacemaker's default operation timeouts (20s). When
set to default and podman is used, force the timeout
to 120s.
Pacemaker's default operation timeout is 20s which
can be reached with high disk IO so setting it to a
safer value of 120s.
constraints:
- allowed_pattern: "([1-9][0-9]*s)?"
- allowed_pattern: "([1-9][0-9]*s)"
parameter_groups:
- label: deprecated
@ -131,9 +130,6 @@ parameter_groups:
conditions:
pcmk_tls_priorities_set:
not: {equals: [{get_param: PacemakerTLSPriorities}, '']}
pcmk_bundle_op_timeout_set:
not: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']}
podman_enabled: {equals: [{get_param: ContainerCli}, 'podman']}
is_ipv6:
equals:
- {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, PacemakerNetwork]}]}
@ -182,17 +178,9 @@ outputs:
- pcmk_tls_priorities_set
- {get_param: PacemakerTLSPriorities}
tripleo::profile::base::pacemaker::resource_op_defaults:
if:
- and:
- pcmk_bundle_op_timeout_set
- podman_enabled
- bundle:
name: timeout
value:
if:
- pcmk_bundle_op_timeout_set
- {get_param: PacemakerBundleOperationTimeout}
- '120s'
bundle:
name: timeout
value: {get_param: PacemakerBundleOperationTimeout}
service_config_settings:
rsyslog:
tripleo_logging_sources_pacemaker: