Skip to content

Commit 83ac571

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

File tree

4 files changed

+5
-14
lines changed

4 files changed

+5
-14
lines changed

manifests/params.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@
485485
}
486486

487487
## Additional graceful failures
488-
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.")
488+
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] < '7' and $facts['os']['name'] != 'Amazon' {
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'], '7') >= 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: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,8 @@ class { 'mysql::server': }
4040
package = if facts[:os]['family'] == 'RedHat'
4141
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
4242
'percona-xtrabackup-24'
43-
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
44-
'percona-xtrabackup'
4543
else
46-
'percona-xtrabackup-20'
44+
'percona-xtrabackup'
4745
end
4846
elsif facts[:os]['name'] == 'Debian'
4947
'percona-xtrabackup-24'
@@ -195,10 +193,8 @@ class { 'mysql::server': }
195193
package = if facts[:os]['family'] == 'RedHat'
196194
if Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '8') >= 0
197195
'percona-xtrabackup-24'
198-
elsif Puppet::Util::Package.versioncmp(facts[:os]['release']['major'], '7') >= 0
199-
'percona-xtrabackup'
200196
else
201-
'percona-xtrabackup-20'
197+
'percona-xtrabackup'
202198
end
203199
elsif facts[:os]['name'] == 'Debian'
204200
'percona-xtrabackup-24'

0 commit comments

Comments
 (0)