Skip to content

Commit 2dd151f

Browse files
committed
revert MariaDB to 10.x release series
puppetlabs-mysql is currently incompatble with MariaDB 11.x: puppetlabs/puppetlabs-mysql#1626
1 parent d6d9594 commit 2dd151f

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1313
* Add support for new operating systems
1414

1515
### Changed
16-
* Change default version of Codership/MySQL, MariaDB and Percona XtraDB
16+
* Change default version of Codership/MySQL to 8.0
17+
* Change default version of MariaDB to 10.11
18+
* Change default version of Percona XtraDB to 8.0
1719
* Enable systemd-based status check on RHEL 9, Debian 12 and Ubuntu 24.04 ([#191])
1820
* Add new dependency for systemd-based status check ([#191])
1921
* Extend unit tests ([#191])

data/common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ galera::codership::galera_package_ensure: 'present'
100100
galera::percona::default_version: '8.0'
101101
# Percona does not allow installation of wsrep-enabled server and wsrep provider.
102102
galera::percona::galera_package_ensure: 'absent'
103-
galera::mariadb::default_version: '11.4'
103+
galera::mariadb::default_version: '10.11'
104104
galera::mariadb::galera_package_ensure: 'present'
105105

106106
# binlog_format is deprecated in MySQL, but still required for MariaDB

spec/acceptance/galera_mariadb_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ class { 'galera':
2525
}
2626
},
2727
vendor_type => 'mariadb',
28-
vendor_version => '11.4'
28+
# FIXME: switch to 11.4, requires this PR:
29+
# https://github.com/puppetlabs/puppetlabs-mysql/pull/1626
30+
vendor_version => '10.11'
2931
}
3032
MANIFEST
3133
end

0 commit comments

Comments
 (0)