summaryrefslogtreecommitdiffstats
path: root/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-13 21:04:24 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-13 21:11:22 +0200
commite3ca391c5de55239b4af8a688ff419bb13457124 (patch)
tree754567832e1565c82bf36613806ce0a393cbb7ad /patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch
parent5923831d4c9edda72ce6c0c4778d11f37d6f60f6 (diff)
Rebase for "Improve reliability of upload_cirros"
Upstream change "Improve reliability of upload_cirros.rb" [1] allows us to drop the "Increase upload_cirros timeout" patch, and also requires rebasing our direct kernel boot patch. Also squashed in a small context edit for an unrelated patch. [1] https://review.openstack.org/#/c/327792/ Change-Id: I8adc30a74714414fae55bc7b81bc0f69f41735ce Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch')
-rw-r--r--patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch4
1 files changed, 1 insertions, 3 deletions
diff --git a/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch b/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch
index 28601599..6d9bc8c7 100644
--- a/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch
+++ b/patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch
@@ -24,14 +24,12 @@ diff --git a/deployment/puppet/osnailyfacter/manifests/database/database.pp b/de
index 1755c34..0cfbc8c 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 {
+@@ -8,4 +8,5 @@ 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))
- $management_vip = hiera('management_vip')
- $database_vip = hiera('database_vip', $management_vip)
@@ -22,6 +23,7 @@ class osnailyfacter::database::database {
$mysql_root_password = $mysql_hash['root_password']