aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-26 20:42:42 +0000
committerGerrit Code Review <review@openstack.org>2016-09-26 20:42:42 +0000
commit44ad407272f8d0703a95411311b9cff04d5b00b2 (patch)
tree4371013b0cf87fb72d01f052586aeae400c2ebd4
parent67b1edd0744830d43d700048da2683c6172e330b (diff)
parent7e32cfa2e3dbaf191f55e2087af677eca7234b91 (diff)
Merge "Add pameter for gmcast.listen_addr configuration"
-rw-r--r--manifests/profile/pacemaker/database/mysql.pp13
1 files changed, 9 insertions, 4 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index c688240..477d17c 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -22,21 +22,26 @@
# (Optional) The address that the local mysql instance should bind to.
# Defaults to $::hostname
#
+# [*gmcast_listen_addr*]
+# (Optional) This variable defines the address on which the node listens to
+# connections from other nodes in the cluster.
+# Defaults to hiera('mysql_bind_host')
+#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::pacemaker::database::mysql (
- $bind_address = $::hostname,
- $step = hiera('step'),
+ $bind_address = $::hostname,
+ $gmcast_listen_addr = hiera('mysql_bind_host'),
+ $step = hiera('step'),
) {
if $::hostname == downcase(hiera('bootstrap_nodeid')) {
$pacemaker_master = true
} else {
$pacemaker_master = false
}
- $mysql_bind_host = hiera('mysql_bind_host')
# use only mysql_node_names when we land a patch in t-h-t that
# switches to autogenerating these values from composable services
@@ -75,7 +80,7 @@ class tripleo::profile::pacemaker::database::mysql (
'wsrep_drupal_282555_workaround'=> '0',
'wsrep_causal_reads' => '0',
'wsrep_sst_method' => 'rsync',
- 'wsrep_provider_options' => "gmcast.listen_addr=tcp://${mysql_bind_host}:4567;",
+ 'wsrep_provider_options' => "gmcast.listen_addr=tcp://${gmcast_listen_addr}:4567;",
}
}