diff options
author | 2016-08-30 09:37:25 +0000 | |
---|---|---|
committer | 2016-08-30 09:37:25 +0000 | |
commit | 27b0ad286c8919c3803872745d67753c00a3bac5 (patch) | |
tree | fbfadc0777b539acec5faa1b3c07adff88f4b703 | |
parent | 66e52a73cf60c8972040929a19b4d56cd7c20737 (diff) | |
parent | b131512a1061046ce9f13ab715ce5362f48f25de (diff) |
Merge "Handle galera_node_names being an array"
-rw-r--r-- | manifests/profile/pacemaker/database/mysql.pp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index fceb415..2715260 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -32,8 +32,17 @@ class tripleo::profile::pacemaker::database::mysql ( $pacemaker_master = false } $mysql_bind_host = hiera('mysql_bind_host') - $galera_nodes = downcase(hiera('galera_node_names', $::hostname)) + + # 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)) + if is_array($galera_node_names_lookup) { + $galera_nodes = downcase(join($galera_node_names_lookup, ',')) + } else { + $galera_nodes = downcase($galera_node_names_lookup) + } $galera_nodes_count = count(split($galera_nodes, ',')) + $mysqld_options = { 'mysqld' => { 'skip-name-resolve' => '1', |