openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Set pacemaker cluster_members_addr"

This commit is contained in:
Zuul 2019-02-01 17:27:14 +00:00 committed by Gerrit Code Review
parent 4949d5901b bc6cbaf136
commit a4db7db597
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/profile/base/pacemaker.pp
View File

@ -121,6 +121,14 @@ class tripleo::profile::base::pacemaker (
'--token' => hiera('corosync_token_timeout', 1000)
}
}
# If hiera('pacemaker_node_ips', []) is not empty we want to create the array
# for puppet pacemaker to use as addresses list which is an array of arrays.
$pacemaker_node_ips = hiera('pacemaker_node_ips', [])
if count($pacemaker_node_ips) > 0 {
$pacemaker_node_ips_real = $pacemaker_node_ips.map |$x| { Array([$x]) }
} else {
$pacemaker_node_ips_real = []
}
if $encryption {
$cluster_setup_extras = merge($cluster_setup_extras_pre, {'--encryption' => '1'})
@ -135,6 +143,7 @@ class tripleo::profile::base::pacemaker (
setup_cluster => $pacemaker_master,
cluster_setup_extras => $cluster_setup_extras,
remote_authkey => $remote_authkey,
cluster_members_addr => $pacemaker_node_ips_real,
}
if str2bool(hiera('docker_enabled', false)) {
include ::systemd::systemctl::daemon_reload