HA: Honour all hiera override variables in mysql_bundle
During a major upgrade, upgrade tasks can rebuild a new pacemaker cluster by adding nodes one at a time. This is implemented by using two special hiera variables mysql_node_names_override and mysql_short_node_names_override. Make sure the mysql_bundle puppet module uses both variables when such cluster rebuild is in progress. Change-Id: I6a06269f55a38071c34d2a95109d213fe7e2452c Closes-Bug: #1859961 Co-Authored-By: Jose Luis Franco Arza <jfrancoa@redhat.com>
This commit is contained in:
parent
ffdb230a7d
commit
0a64eebb64
|
@ -167,7 +167,8 @@ class tripleo::profile::pacemaker::database::mysql_bundle (
|
||||||
$log_driver_real = $log_driver
|
$log_driver_real = $log_driver
|
||||||
}
|
}
|
||||||
# FQDN are lowercase in /etc/hosts, so are pacemaker node names
|
# 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)) {
|
if (hiera('mysql_node_names_override', undef)) {
|
||||||
$galera_fqdns_names_lookup = downcase(hiera('mysql_node_names_override'))
|
$galera_fqdns_names_lookup = downcase(hiera('mysql_node_names_override'))
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue