Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

(CAT-1428) Removal of redhat/scientific/oraclelinux 6 for mysql module #1597

Merged
merged 1 commit into from
Sep 20, 2023
Merged

(CAT-1428) Removal of redhat/scientific/oraclelinux 6 for mysql module #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions manifests/params.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
}

## Additional graceful failures
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '4' and $facts['os']['name'] != 'Amazon' {
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.")
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] < '7' and $facts['os']['name'] != 'Amazon' {
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 7.0 and beyond.")
}
}
2 changes: 1 addition & 1 deletion spec/acceptance/05_mysql_xtrabackup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class { 'mysql::server': root_password => 'password' }
/RedHat/: {
# RHEL/CentOS 5 is no longer supported by Percona, but older versions
# of the repository are still available.
if versioncmp($facts['os']['release']['major'], '6') >= 0 {
praj1001 marked this conversation as resolved.
Show resolved Hide resolved
if versioncmp($facts['os']['release']['major'], '7') >= 0 {
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
$epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
} else {
Expand Down
5 changes: 0 additions & 5 deletions spec/acceptance/types/mysql_plugin_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
case os[:family]
when 'redhat'
case os[:release].to_i
when 5
plugin = nil # Plugins not supported on mysql on RHEL 5
when 6
plugin = 'example'
plugin_lib = 'ha_example.so'
when 7
plugin = 'pam'
plugin_lib = 'auth_pam.so'
Expand Down
8 changes: 2 additions & 6 deletions spec/classes/mysql_backup_xtrabackup_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,8 @@ class { 'mysql::server': }
package = if facts[:os]['family'] == 'RedHat'
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
'percona-xtrabackup-24'
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
'percona-xtrabackup'
else
'percona-xtrabackup-20'
'percona-xtrabackup'
end
elsif facts[:os]['name'] == 'Debian'
'percona-xtrabackup-24'
Expand Down Expand Up @@ -195,10 +193,8 @@ class { 'mysql::server': }
package = if facts[:os]['family'] == 'RedHat'
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
'percona-xtrabackup-24'
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
'percona-xtrabackup'
else
'percona-xtrabackup-20'
'percona-xtrabackup'
end
elsif facts[:os]['name'] == 'Debian'
'percona-xtrabackup-24'
Expand Down