aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/pacemaker.pp
diff options
context:
space:
mode:
authorMichele Baldessari <michele@acksyn.org>2016-12-07 17:59:03 +0100
committerMichele Baldessari <michele@acksyn.org>2016-12-08 17:16:40 +0100
commit5054f122d829f13a099ad7901626550ce5aa6372 (patch)
treef59f13add77f90d978c523ab9d3e09616a4ff75c /manifests/profile/base/pacemaker.pp
parenta102d35f12e75bbf7fa9c5f91aeaef145f203143 (diff)
Do not use hardcoded controller_node_names when setting up the cluster
Currently we chose the pacemaker cluster node by simply taking hiera('controller_node_names'). We should instead use the pacemaker_short_node_names array which is built dynamically from all the nodes that include the pacemaker service. Change-Id: I0a3e4acaab11e078da5eeb2ef2adde5387785927
Diffstat (limited to 'manifests/profile/base/pacemaker.pp')
-rw-r--r--manifests/profile/base/pacemaker.pp3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/profile/base/pacemaker.pp b/manifests/profile/base/pacemaker.pp
index cc5fd8a..19eb52b 100644
--- a/manifests/profile/base/pacemaker.pp
+++ b/manifests/profile/base/pacemaker.pp
@@ -40,7 +40,8 @@ class tripleo::profile::base::pacemaker (
$enable_fencing = str2bool(hiera('enable_fencing', false)) and $step >= 5
if $step >= 1 {
- $pacemaker_cluster_members = downcase(regsubst(hiera('controller_node_names'), ',', ' ', 'G'))
+ $pacemaker_short_node_names = join(hiera('pacemaker_short_node_names'), ',')
+ $pacemaker_cluster_members = downcase(regsubst($pacemaker_short_node_names, ',', ' ', 'G'))
$corosync_ipv6 = str2bool(hiera('corosync_ipv6', false))
if $corosync_ipv6 {
$cluster_setup_extras = { '--token' => hiera('corosync_token_timeout', 1000), '--ipv6' => '' }