aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-06 08:52:15 +0000
committerGerrit Code Review <review@openstack.org>2016-10-06 08:52:15 +0000
commit582a212f42f0074a2ef0b73e0032d99adfdb1de0 (patch)
tree84293b28f0b2db023d80de391714187c6e134b0b
parent57ba68a7959c6d3ffccedee38fc488e5cf7d1d48 (diff)
parent39d88a49bf83a7a3437edc82f42986596356d331 (diff)
Merge "Enable usage of "short names" for Galera cluster"
-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 {