diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-12-18 16:53:26 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-01-21 18:07:28 +0100 |
commit | e42a9b3011f96ad26f4a19db77ac44cad31a4290 (patch) | |
tree | b6a1c7f918138dd3e4705d170dde85eb2e5aaa6a /patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch | |
parent | 5c258a9ae96fd2a0c6fd56e41c4368467e931782 (diff) |
Uplift Armband to Fuel Newton
[ Dan Andresan ]
- puppet: database: Fix Percona XtraBackup sync
[ Alexandru Avadanii ]
- disable all plugins;
- re-enable remote tracking;
- remove "Revert: Point to specific snapshot ...";
- patch context adjustments;
- obsolete "kernel-bump", linux-image-lts-xenial is now the default;
- network-checker iface state check now fixed upstream [1];
- fuel-nailgun-agent hugepage size should also check /proc/meminfo;
- fuel-nailgun-agent CPU detection for AArch64;
- nova AArch64 hugepage support is now upstream;
- obsolete Cirros Test VM direct kernel boot (by switch to AAVMF):
* f-l/0001-upload_cirros-Add-direct-kernel-boot-support.patch
* f-w/0001-direct-kernel-boot-for-cirros.patch
- rework m1.micro RAM size patch after puppet manifest split upstream;
- re-enable arch-agnostic plugins which were rebased in Fuel@OPNFV:
* f_yardstick-pluginbuild
* f_congress-pluginbuild
- do NOT retire MySQL SST provider patch series (nack: ARMBAND-186),
rebase (and keep for now) MySQL SST provider patches, as trying to
use xtrabackup-v2 revelead a regression since Colorado.3.0, and
these patches simplify troubleshooting a lot;
- AArch64: nova: libvirt: Use host-model cpu (ARMBAND-193);
- AArch64: nova: libvirt: Use pointer_model instead of use_usb_tablet;
- m1.micro RAM size insufficient for TestVM with AAVMF (s/128/256/)
- switch Cirros TestVM to AAVMF from direct kernel boot;
- backport nova libvirt driver fix for deleting instances booted with
AAVMF firmware from [2];
TODO (later):
- Include ISO build time fixes for cirros_testvm in Armband package;
TODO (ODL, later):
- test & revise leveldb patching;
- bring back Qugga patching for arm64;
- configure systemd service to automatically respawn;
[1] https://review.openstack.org/#/c/417373/
[2] https://review.openstack.org/#/c/357190/
JIRA: ARMBAND-29
JIRA: ARMBAND-32
JIRA: ARMBAND-63
JIRA: ARMBAND-88
JIRA: ARMBAND-116
JIRA: ARMBAND-118
JIRA: ARMBAND-186
JIRA: ARMBAND-193
JIRA: ARMBAND-194
JIRA: ARMBAND-195
JIRA: ARMBAND-196
JIRA: ARMBAND-197
Change-Id: Ia99022e364e61245d109cabab9d0ed7157b4d2f5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Signed-off-by: Dan Andresan <dan.andresan@enea.com>
Diffstat (limited to 'patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch')
-rw-r--r-- | patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch b/patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch new file mode 100644 index 00000000..bf09ce07 --- /dev/null +++ b/patches/fuel-library/0001-puppet-database-Fix-Percona-XtraBackup-sync.patch @@ -0,0 +1,54 @@ +From: Dan Andresan <dan.andresan@enea.com> +Date: Fri, 20 Jan 2017 17:24:40 +0200 +Subject: [PATCH] puppet: database: Fix Percona XtraBackup sync + +Recently, Percona released XtraBackup 2.4.5 which considers that SSL +is enabled if it finds ssl-ca, ssl-cert, ssl-key set up in my.cnf, +even if ssl is set to false in the same config file. Furthermore, +it complains that ssl is deprecated on the stdout instead of stderr, +corrupting xbstream in the process. + +Because ssl was set to false, this patch delete all other ssl-* keys +from the config file, avoiding xtrabackup getting confused. + +See percona xtrabackup bugs here: +https://bugs.launchpad.net/percona-xtrabackup/+bug/1646480 +https://bugs.launchpad.net/percona-xtrabackup/+bug/1647340 + +Closes-bug: https://jira.opnfv.org/browse/ARMBAND-197 + +Signed-off-by: Dan Andresan <dan.andresan@enea.com> +--- + .../puppet/osnailyfacter/manifests/database/database.pp | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/deployment/puppet/osnailyfacter/manifests/database/database.pp b/deployment/puppet/osnailyfacter/manifests/database/database.pp +index 4fca959..ce406d7 100644 +--- a/deployment/puppet/osnailyfacter/manifests/database/database.pp ++++ b/deployment/puppet/osnailyfacter/manifests/database/database.pp +@@ -253,12 +253,24 @@ class osnailyfacter::database::database { + package_name => $mysql_package_name, + } + ++ # remove ssl - not used and confuse Percona XtraBackup 2.4.5 ++ # see ARMBAND-197: https://jira.opnfv.org/browse/ARMBAND-197 ++ $percona_hotfix = { ++ 'mysqld' => { ++ 'ssl' => undef, ++ 'ssl-ca' => undef, ++ 'ssl-cert' => undef, ++ 'ssl-key' => undef ++ } ++ } ++ + # build our mysql options to be configured in my.cnf + $mysql_override_options = mysql_deepmerge( + $fuel_override_options, + $ignore_db_dir_options, + $binary_logs_options, +- $syslog_options ++ $syslog_options, ++ $percona_hotfix + ) + $galera_options = mysql_deepmerge($wsrep_options, $vendor_override_options) + $override_options = mysql_deepmerge($mysql_override_options, $galera_options) |