From a41259028cb50ebb298f703402be86c0f86c2ee2 Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Tue, 6 Aug 2024 17:24:31 +0200 Subject: [PATCH] change default versions: Codership, MariaDB, Percona --- CHANGELOG.md | 1 + README.md | 8 ++++---- data/Debian-family.yaml | 7 +++++++ data/RedHat-family.yaml | 6 ++++++ data/common.yaml | 6 +++--- spec/acceptance/galera_mariadb_spec.rb | 2 +- spec/acceptance/galera_spec.rb | 2 +- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e2e2366..367c838 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. * Add support for new operating systems ### Changed +* Change default version of Codership/MySQL, MariaDB and Percona XtraDB * Enable systemd-based status check on RHEL 9, Debian 12 and Ubuntu 24.04 ([#191]) * Add new dependency for systemd-based status check ([#191]) * Extend unit tests ([#191]) diff --git a/README.md b/README.md index 5126505..b48f2fe 100644 --- a/README.md +++ b/README.md @@ -237,12 +237,12 @@ Below you will find an **incomplete** and possibly **outdated** list of known (i | | RedHat | Debian | Ubuntu | FreeBSD | | :--- | :---: | :---: | :---: | :---: | -| **Percona XtraDB Cluster** | 7 / 8 | 10 / 11 | 20.04 / 22.04 | 13.x | -| 5.7 / 8.0 | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :no_entry_sign: :no_entry_sign: | :no_entry_sign: :no_entry_sign: | +| **Percona XtraDB Cluster** | 8 / 9 | 11 / 12 | 22.04 / 24.04 | 14.x | +| 8.0 | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :no_entry_sign: :no_entry_sign: | | **Codership Galera (MySQL)** | | | | | -| 5.7 / 8.0 | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :no_entry_sign: :no_entry_sign: **/** :green_circle: :green_circle: | :no_entry_sign: :green_circle: **/** :no_entry_sign: :no_entry_sign: | :green_circle: :no_entry_sign: | +| 8.0 / 8.4 | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :no_entry_sign: | | **MariaDB Galera Cluster** | | | | | -| 10.5 / 10.6 | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: **/** :green_circle: :green_circle: | :green_circle: :green_circle: | +| 10.11 / 11.4 | :no_entry_sign: :no_entry_sign: **/** :green_circle: :green_circle: | :no_entry_sign: :no_entry_sign: **/** :green_circle: :green_circle: | :no_entry_sign: :no_entry_sign: **/** :green_circle: :green_circle: | :green_circle: :green_circle: | The table only includes the **two most recent** versions. Older and possibly outdated releases are not listed, although they may still be supported by their vendors. diff --git a/data/Debian-family.yaml b/data/Debian-family.yaml index 900a352..db26f5b 100644 --- a/data/Debian-family.yaml +++ b/data/Debian-family.yaml @@ -85,6 +85,13 @@ galera::mariadb::1011::client_package_name: 'mariadb-client-10.11' galera::mariadb::1011::galera_package_name: 'galera-4' galera::mariadb::1011::mysql_package_name: 'mariadb-server-10.11' +galera::mariadb::114::arbitrator_config_file: '/etc/default/garb' +galera::mariadb::114::arbitrator_package_name: 'galera-arbitrator-4' +galera::mariadb::114::arbitrator_service_name: 'garb' +galera::mariadb::114::client_package_name: 'mariadb-client-11.4' +galera::mariadb::114::galera_package_name: 'galera-4' +galera::mariadb::114::mysql_package_name: 'mariadb-server-11.4' + # # MariaDB - default settings # diff --git a/data/RedHat-family.yaml b/data/RedHat-family.yaml index ed1cc84..f81fc3f 100644 --- a/data/RedHat-family.yaml +++ b/data/RedHat-family.yaml @@ -99,6 +99,12 @@ galera::mariadb::1011::galera_package_name: 'galera-4' galera::mariadb::1011::libgalera_location: '/usr/lib64/galera-4/libgalera_smm.so' galera::mariadb::1011::mysql_package_name: 'MariaDB-server' +galera::mariadb::114::arbitrator_package_name: 'galera-4' +galera::mariadb::114::client_package_name: 'MariaDB-client' +galera::mariadb::114::galera_package_name: 'galera-4' +galera::mariadb::114::libgalera_location: '/usr/lib64/galera-4/libgalera_smm.so' +galera::mariadb::114::mysql_package_name: 'MariaDB-server' + # # MariaDB - default settings # diff --git a/data/common.yaml b/data/common.yaml index 15100c9..7a565fc 100644 --- a/data/common.yaml +++ b/data/common.yaml @@ -95,12 +95,12 @@ galera::percona::additional_packages: galera::mariadb::additional_packages: - 'nmap' -galera::codership::default_version: '5.7' +galera::codership::default_version: '8.0' galera::codership::galera_package_ensure: 'present' -galera::percona::default_version: '5.7' +galera::percona::default_version: '8.0' # Percona does not allow installation of wsrep-enabled server and wsrep provider. galera::percona::galera_package_ensure: 'absent' -galera::mariadb::default_version: '10.3' +galera::mariadb::default_version: '11.4' galera::mariadb::galera_package_ensure: 'present' # binlog_format is deprecated in MySQL, but still required for MariaDB diff --git a/spec/acceptance/galera_mariadb_spec.rb b/spec/acceptance/galera_mariadb_spec.rb index b17770b..64a2f53 100644 --- a/spec/acceptance/galera_mariadb_spec.rb +++ b/spec/acceptance/galera_mariadb_spec.rb @@ -25,7 +25,7 @@ class { 'galera': } }, vendor_type => 'mariadb', - vendor_version => '10.6' + vendor_version => '11.4' } MANIFEST end diff --git a/spec/acceptance/galera_spec.rb b/spec/acceptance/galera_spec.rb index 4ad57ed..dcf26d3 100644 --- a/spec/acceptance/galera_spec.rb +++ b/spec/acceptance/galera_spec.rb @@ -25,7 +25,7 @@ class { 'galera': } }, vendor_type => 'percona', - vendor_version => '5.7' + vendor_version => '8.0' } MANIFEST end