openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "HA: Honour all hiera override variables in mysql_bundle" into stable/train

This commit is contained in:
Zuul 2020-01-21 04:39:37 +00:00 committed by Gerrit Code Review
parent 6f9bf6cdb0 7aec7fc5cf
commit a447b6b516
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -167,7 +167,8 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
$log_driver_real = $log_driver
}
# FQDN are lowercase in /etc/hosts, so are pacemaker node names
$galera_node_names_lookup = downcase(hiera('mysql_short_node_names', $::hostname))
$galera_node_names_lookup = downcase(hiera('mysql_short_node_names_override',
hiera('mysql_short_node_names', $::hostname)))
if (hiera('mysql_node_names_override', undef)) {
$galera_fqdns_names_lookup = downcase(hiera('mysql_node_names_override'))
} else {