openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Simplify pacemaker service templates"

Browse Source
This commit is contained in:
Zuul 2021-05-22 15:52:17 +00:00 committed by Gerrit Code Review
commit 2a74d26ea7
3 changed files with 37 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/pacemaker/clustercheck-container-puppet.yaml
View File

@ -37,7 +37,6 @@ parameters:
type: json type: json
resources: resources:
ContainersCommon: ContainersCommon:
type: ../containers-common.yaml type: ../containers-common.yaml
@ -90,8 +89,7 @@ outputs:
volumes: volumes:
list_concat: list_concat:
- {get_attr: [ContainersCommon, volumes]} - {get_attr: [ContainersCommon, volumes]}
- - - /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
- /var/lib/kolla/config_files/clustercheck.json:/var/lib/kolla/config_files/config.json
- /var/lib/config-data/puppet-generated/clustercheck:/var/lib/kolla/config_files/src:ro - /var/lib/config-data/puppet-generated/clustercheck:/var/lib/kolla/config_files/src:ro
- /var/lib/mysql:/var/lib/mysql - /var/lib/mysql:/var/lib/mysql
environment: environment:

1
deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
View File

@ -37,7 +37,6 @@ parameters:
default: 6642 default: 6642
resources: resources:
OVNDBsBase: OVNDBsBase:
type: ../ovn-dbs.yaml type: ../ovn-dbs.yaml
properties: properties:

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

@ -129,8 +129,10 @@ parameter_groups:
- CorosyncIPv6 - CorosyncIPv6
conditions: conditions:
pcmk_tls_priorities_empty: {equals: [{get_param: PacemakerTLSPriorities}, '']} pcmk_tls_priorities_set:
pcmk_bundle_op_timeout_empty: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']} not: {equals: [{get_param: PacemakerTLSPriorities}, '']}
pcmk_bundle_op_timeout_set:
not: {equals: [{get_param: PacemakerBundleOperationTimeout}, '']}
podman_enabled: {equals: [{get_param: ContainerCli}, 'podman']} podman_enabled: {equals: [{get_param: ContainerCli}, 'podman']}
is_ipv6: is_ipv6:
equals: equals:
@ -154,8 +156,7 @@ outputs:
proto: 'udp' proto: 'udp'
dport: 5405 dport: 5405
config_settings: config_settings:
map_merge: pacemaker::corosync::cluster_name: 'tripleo_cluster'
- pacemaker::corosync::cluster_name: 'tripleo_cluster'
pacemaker::corosync::manage_fw: false pacemaker::corosync::manage_fw: false
pacemaker::resource_defaults::defaults: pacemaker::resource_defaults::defaults:
resource-stickiness: { value: INFINITY } resource-stickiness: { value: INFINITY }
@ -176,25 +177,22 @@ outputs:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]} $NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
- tripleo::pacemaker::tls_priorities:
if: if:
- pcmk_tls_priorities_empty - pcmk_tls_priorities_set
- {} - {get_param: PacemakerTLSPriorities}
- tripleo::pacemaker::tls_priorities: {get_param: PacemakerTLSPriorities} tripleo::profile::base::pacemaker::resource_op_defaults:
-
if: if:
- and: - and:
- pcmk_bundle_op_timeout_empty - pcmk_bundle_op_timeout_set
- not: podman_enabled - podman_enabled
- {} - bundle:
- tripleo::profile::base::pacemaker::resource_op_defaults:
bundle:
name: timeout name: timeout
value: value:
if: if:
- pcmk_bundle_op_timeout_empty - pcmk_bundle_op_timeout_set
- '120s'
- {get_param: PacemakerBundleOperationTimeout} - {get_param: PacemakerBundleOperationTimeout}
- '120s'
service_config_settings: service_config_settings:
rsyslog: rsyslog:
tripleo_logging_sources_pacemaker: tripleo_logging_sources_pacemaker: