openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make pcsd listen on PacemakerNetwork/PacemakerRemoteNetwork" into stable/train

This commit is contained in:
Zuul 2020-01-25 13:28:11 +00:00 committed by Gerrit Code Review
parent 52d17b06fc 7ee6cdec11
commit ac253147e9
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,12 @@ outputs:
- {get_param: PcsdPassword}
- {get_param: [DefaultPasswords, pcsd_password]}
tripleo::profile::base::pacemaker::remote_authkey: {get_param: PacemakerRemoteAuthkey}
tripleo::profile::base::pacemaker::pcsd_bind_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PacemakerNetwork]}
-
if:
- pcmk_tls_priorities_empty

6
deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml
View File

@ -100,6 +100,12 @@ outputs:
tripleo::fencing::deep_compare: true
enable_fencing: {get_param: EnableFencing}
tripleo::profile::base::pacemaker_remote::remote_authkey: {get_param: PacemakerRemoteAuthkey}
tripleo::profile::base::pacemaker_remote::pcsd_bind_addr:
str_replace:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, PacemakerRemoteNetwork]}
pacemaker::corosync::manage_fw: false
hacluster_pwd:
yaql: