Merge pull request #1387 from rsynnest/main

pmcmaw · web-flow · commit 6183586358a5 · 2021-05-24T10:16:24.000+01:00
Update xtrabackup package name for Ubuntu 20.04
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -248,6 +248,7 @@
         $php_package_name = 'php5-mysql'
       }
       if  ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or
+      ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) or
       ($::operatingsystem == 'Debian') {
         $xtrabackup_package_name_override = 'percona-xtrabackup-24'
       }
diff --git a/spec/classes/mysql_backup_xtrabackup_spec.rb b/spec/classes/mysql_backup_xtrabackup_spec.rb
@@ -40,7 +40,9 @@ class { 'mysql::server': }
                   elsif facts[:operatingsystem] == 'Debian'
                     'percona-xtrabackup-24'
                   elsif facts[:operatingsystem] == 'Ubuntu'
-                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
+                      'percona-xtrabackup-24'
+                    elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-24'
@@ -125,7 +127,9 @@ class { 'mysql::server': }
                   elsif facts[:operatingsystem] == 'Debian'
                     'percona-xtrabackup-24'
                   elsif facts[:operatingsystem] == 'Ubuntu'
-                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
+                    if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '20') >= 0
+                      'percona-xtrabackup-24'
+                    elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '16') >= 0
                       'percona-xtrabackup'
                     else
                       'percona-xtrabackup-24'

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@`
`248`	`248`	`$php_package_name = 'php5-mysql'`
`249`	`249`	`}`
`250`	`250`	`if ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '16.04') < 0) or`
	`251`	`+ ($::operatingsystem == 'Ubuntu' and versioncmp($::operatingsystemrelease, '20.04') >= 0) or`
`251`	`252`	`($::operatingsystem == 'Debian') {`
`252`	`253`	`$xtrabackup_package_name_override = 'percona-xtrabackup-24'`
`253`	`254`	`}`