From e3ca391c5de55239b4af8a688ff419bb13457124 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 13 Jun 2016 21:04:24 +0200 Subject: 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 --- .../0013-Allow-configuring-MySQL-WSREP-SST-provider.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'patches/fuel-library/0013-Allow-configuring-MySQL-WSREP-SST-provider.patch') 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'] -- cgit 1.2.3-korg