Skip to content

Commit 0614dff

Browse files
committed
Replace operatingsystemmajrelease with os.release.major
1 parent 6e88b1f commit 0614dff

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

manifests/params.pp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,16 +56,16 @@
5656
}
5757
}
5858
/^(RedHat|Rocky|CentOS|Scientific|OracleLinux|AlmaLinux)$/: {
59-
if versioncmp($::operatingsystemmajrelease, '7') >= 0 {
59+
if versioncmp($facts['os']['release']['major'], '7') >= 0 {
6060
$provider = 'mariadb'
61-
if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
61+
if versioncmp($facts['os']['release']['major'], '8') >= 0 {
6262
$xtrabackup_package_name = 'percona-xtrabackup-24'
6363
}
6464
} else {
6565
$provider = 'mysql'
6666
$xtrabackup_package_name = 'percona-xtrabackup-20'
6767
}
68-
if versioncmp($::operatingsystemmajrelease, '8') >= 0 {
68+
if versioncmp($facts['os']['release']['major'], '8') >= 0 {
6969
$java_package_name = 'mariadb-java-client'
7070
$python_package_name = 'python3-PyMySQL'
7171
} else {
@@ -516,7 +516,7 @@
516516
}
517517

518518
## Additional graceful failures
519-
if $facts['os']['family'] == 'RedHat' and $::operatingsystemmajrelease == '4' and $facts['os']['name'] != 'Amazon' {
519+
if $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '4' and $facts['os']['name'] != 'Amazon' {
520520
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.")
521521
}
522522
}

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($::operatingsystemmajrelease, '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 {

0 commit comments

Comments
 (0)