aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-22 07:58:15 +0000
committerGerrit Code Review <review@openstack.org>2016-12-22 07:58:16 +0000
commite8b6d6515e20610a448149fe446053df3dc05230 (patch)
treeaff8054d920f30e687f4bee247ccd0b1c7f9f2a4 /manifests/profile/base
parent1adc49a38985a884ca66643bc528e1c3298a75e1 (diff)
parent5054f122d829f13a099ad7901626550ce5aa6372 (diff)
Merge "Do not use hardcoded controller_node_names when setting up the cluster"
Diffstat (limited to 'manifests/profile/base')
-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' => '' }