aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/pacemaker
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-10-05 10:48:32 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-10-05 10:56:00 +0300
commit39d88a49bf83a7a3437edc82f42986596356d331 (patch)
tree371e891c8d91e9e5f6ce70219b1aa79dbd21e768 /manifests/profile/pacemaker
parent39c9c6508a43b7c705f4f206e1093080c921b7d6 (diff)
Enable usage of "short names" for Galera cluster
We're not able to use FQDNs yet, so to work around this, we give precedence to a "short name" list we'll get from t-h-t. Change-Id: I4ef7786474c229d5212a0deb2ca02ee992b030d8 Related-Bug: #1628521
Diffstat (limited to 'manifests/profile/pacemaker')
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp7
1 files changed, 6 insertions, 1 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 0169e16..7464854 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -45,7 +45,12 @@ class tripleo::profile::pacemaker::database::mysql (
# use only mysql_node_names when we land a patch in t-h-t that
# switches to autogenerating these values from composable services
- $galera_node_names_lookup = hiera('mysql_node_names', hiera('galera_node_names', $::hostname))
+ # The galera node names need to match the pacemaker node names... so if we
+ # want to use FQDNs for this, the cluster will not finish bootstrapping,
+ # since all the nodes will be marked as slaves. For now, we'll stick to the
+ # short name which is already registered in pacemaker until we get around
+ # this issue.
+ $galera_node_names_lookup = hiera('mysql_short_node_names', hiera('mysql_node_names', $::hostname))
if is_array($galera_node_names_lookup) {
$galera_nodes = downcase(join($galera_node_names_lookup, ','))
} else {