diff options
author | 2017-01-21 18:34:06 +0000 | |
---|---|---|
committer | 2017-01-21 18:34:06 +0000 | |
commit | 4c74ad945b5b20be3014178070b495f10c16a74e (patch) | |
tree | f76b2e9892bd056b3da3a03a0ad27c5f8d2bb9ab /patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch | |
parent | 2662d9c5800b67d9375c22ccac439e3aeea3b4e5 (diff) | |
parent | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (diff) |
Merge "Uplift Armband to Fuel Newton"
Diffstat (limited to 'patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch')
-rw-r--r-- | patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch b/patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch index 632aa8f3..f52af67a 100644 --- a/patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch +++ b/patches/fuel-library/mysql-sst-provider/0001-Allow-configuring-MySQL-WSREP-SST-provider.patch @@ -24,17 +24,16 @@ diff --git a/deployment/puppet/osnailyfacter/manifests/database/database.pp b/de index e741ff8..be19eb5 100644 --- a/deployment/puppet/osnailyfacter/manifests/database/database.pp +++ b/deployment/puppet/osnailyfacter/manifests/database/database.pp -@@ -8,6 +8,7 @@ class osnailyfacter::database::database { - $use_syslog = hiera('use_syslog', true) - $primary_controller = hiera('primary_controller') - $mysql_hash = hiera_hash('mysql', {}) -+ $wsrep_hash = hiera_hash('mysql_wsrep', {}) - $debug = pick($mysql_hash['debug'], hiera('debug', false)) +@@ -8,5 +8,6 @@ class osnailyfacter::database::database { + $use_syslog = hiera('use_syslog', true) + $mysql_hash = hiera_hash('mysql', {}) ++ $wsrep_hash = hiera_hash('mysql_wsrep', {}) + $debug = pick($mysql_hash['debug'], hiera('debug', false)) - $mgmt_iface = get_network_role_property('mgmt/database', 'interface') + $mgmt_iface = get_network_role_property('mgmt/database', 'interface') @@ -17,6 +18,7 @@ class osnailyfacter::database::database { - $mysql_root_password = $mysql_hash['root_password'] + $deb_sysmaint_password = $mysql_hash['wsrep_password'] $enabled = pick($mysql_hash['enabled'], true) + $wsrep_sst_method = pick($wsrep_hash['wsrep_method'], 'xtrabackup-v2') |