Skip to content

Commit 48f77d8

Browse files
committed
(CAT-1428) Removal of redhat/scientific/oraclelinux 6 for mysql module
1 parent 79b8570 commit 48f77d8

File tree

4 files changed

+2
-11
lines changed

4 files changed

+2
-11
lines changed

manifests/params.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,6 @@
486486

487487
## Additional graceful failures
488488
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '4' and $facts['os']['name'] != 'Amazon' {
489-
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.")
489+
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 7.0 and beyond.")
490490
}
491491
}

spec/acceptance/05_mysql_xtrabackup_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class { 'mysql::server': root_password => 'password' }
4040
/RedHat/: {
4141
# RHEL/CentOS 5 is no longer supported by Percona, but older versions
4242
# of the repository are still available.
43-
if versioncmp($facts['os']['release']['major'], '6') >= 0 {
43+
if versioncmp($facts['os']['release']['major'], '6') > 0 {
4444
$percona_url = 'http://repo.percona.com/yum/percona-release-latest.noarch.rpm'
4545
$epel_url = "https://download.fedoraproject.org/pub/epel/epel-release-latest-${facts['os']['release']['major']}.noarch.rpm"
4646
} else {

spec/acceptance/types/mysql_plugin_spec.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
case os[:family]
1010
when 'redhat'
1111
case os[:release].to_i
12-
when 5
13-
plugin = nil # Plugins not supported on mysql on RHEL 5
14-
when 6
15-
plugin = 'example'
16-
plugin_lib = 'ha_example.so'
1712
when 7
1813
plugin = 'pam'
1914
plugin_lib = 'auth_pam.so'

spec/classes/mysql_backup_xtrabackup_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ class { 'mysql::server': }
4242
'percona-xtrabackup-24'
4343
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
4444
'percona-xtrabackup'
45-
else
46-
'percona-xtrabackup-20'
4745
end
4846
elsif facts[:os]['name'] == 'Debian'
4947
'percona-xtrabackup-24'
@@ -197,8 +195,6 @@ class { 'mysql::server': }
197195
'percona-xtrabackup-24'
198196
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
199197
'percona-xtrabackup'
200-
else
201-
'percona-xtrabackup-20'
202198
end
203199
elsif facts[:os]['name'] == 'Debian'
204200
'percona-xtrabackup-24'

0 commit comments

Comments
 (0)