Replace osfamily with os.family

Author: smortex

manifests/backup/mysqlbackup.pp

@@ -74,9 +74,9 @@
   }
 
   if $install_cron {
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       ensure_packages('cronie')
-    } elsif $::osfamily != 'FreeBSD' {
+    } elsif $facts['os']['family'] != 'FreeBSD' {
       ensure_packages('cron')
     }
   }

manifests/backup/mysqldump.pp

@@ -41,7 +41,7 @@
     $backuppassword
   }
 
-  unless $::osfamily == 'FreeBSD' {
+  unless $facts['os']['family'] == 'FreeBSD' {
     if $backupcompress and $compression_command == 'bzcat -zc' {
       ensure_packages(['bzip2'])
       Package['bzip2'] -> File['mysqlbackup.sh']
@@ -69,9 +69,9 @@
   }
 
   if $install_cron {
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       ensure_packages('cronie')
-    } elsif $::osfamily != 'FreeBSD' {
+    } elsif $facts['os']['family'] != 'FreeBSD' {
       ensure_packages('cron')
     }
   }

manifests/backup/xtrabackup.pp

@@ -109,9 +109,9 @@
   }
 
   if $install_cron {
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       ensure_packages('cronie')
-    } elsif $::osfamily != 'FreeBSD' {
+    } elsif $facts['os']['family'] != 'FreeBSD' {
       ensure_packages('cron')
     }
   }
@@ -138,7 +138,7 @@
   }
 
   # Wether to use GNU or BSD date format.
-  case $::osfamily {
+  case $facts['os']['family'] {
     'FreeBSD','OpenBSD': {
       $dateformat = '$(date -v-sun +\\%F)_full'
     }

manifests/bindings.pp

@@ -100,7 +100,7 @@
   $daemon_dev_package_name     = $mysql::params::daemon_dev_package_name,
   $daemon_dev_package_provider = $mysql::params::daemon_dev_package_provider
 ) inherits mysql::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     'Archlinux': {
       if $java_enable { fail("::mysql::bindings::java cannot be managed by puppet on ${::facts['os']['family']} as it is not in official repositories. Please disable java mysql binding.") }
       if $perl_enable { include 'mysql::bindings::perl' }

manifests/params.pp

@@ -37,7 +37,7 @@
   $daemon_dev_package_ensure   = 'present'
   $daemon_dev_package_provider = undef
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       case $::operatingsystem {
         'Fedora': {
@@ -425,7 +425,7 @@
         }
 
         default: {
-          fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${::osfamily} or ${::operatingsystem}.")
+          fail("Unsupported platform: puppetlabs-${module_name} currently doesn\'t support ${facts['os']['family']} or ${::operatingsystem}.")
         }
       }
     }
@@ -516,7 +516,7 @@
   }
 
   ## Additional graceful failures
-  if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
+  if $facts['os']['family'] == 'RedHat' and $::operatingsystemmajrelease == '4' and $::operatingsystem != 'Amazon' {
     fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 6.0 and beyond.")
   }
 }

spec/classes/graceful_failures_spec.rb

@@ -6,7 +6,9 @@
   context 'on an unsupported OS' do
     let(:facts) do
       {
-        osfamily: 'UNSUPPORTED',
+        os: {
+          family: 'UNSUPPORTED',
+        },
         operatingsystem: 'UNSUPPORTED',
       }
     end

spec/classes/mysql_backup_xtrabackup_spec.rb

@@ -37,7 +37,7 @@ class { 'mysql::server': }
           )
         end
 
-        package = if facts[:osfamily] == 'RedHat'
+        package = if facts[:os]['family'] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
                       'percona-xtrabackup-24'
                     elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
@@ -55,7 +55,7 @@ class { 'mysql::server': }
                     else
                       'percona-xtrabackup-24'
                     end
-                  elsif facts[:osfamily] == 'Suse'
+                  elsif facts[:os]['family'] == 'Suse'
                     'xtrabackup'
                   else
                     'percona-xtrabackup'
@@ -75,7 +75,7 @@ class { 'mysql::server': }
         end
 
         it 'contains the daily cronjob for weekdays 1-6' do
-          dateformat = case facts[:osfamily]
+          dateformat = case facts[:os]['family']
                        when 'FreeBSD', 'OpenBSD'
                          '$(date -v-sun +\%F)_full'
                        else
@@ -193,7 +193,7 @@ class { 'mysql::server': }
           { additional_cron_args: '--backup --skip-ssl' }.merge(default_params)
         end
 
-        package = if facts[:osfamily] == 'RedHat'
+        package = if facts[:os]['family'] == 'RedHat'
                     if Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '8') >= 0
                       'percona-xtrabackup-24'
                     elsif Puppet::Util::Package.versioncmp(facts[:operatingsystemmajrelease], '7') >= 0
@@ -211,13 +211,13 @@ class { 'mysql::server': }
                     else
                       'percona-xtrabackup-24'
                     end
-                  elsif facts[:osfamily] == 'Suse'
+                  elsif facts[:os]['family'] == 'Suse'
                     'xtrabackup'
                   else
                     'percona-xtrabackup'
                   end
 
-        dateformat = case facts[:osfamily]
+        dateformat = case facts[:os]['family']
                      when 'FreeBSD', 'OpenBSD'
                        '$(date -v-sun +\%F)_full'
                      else

spec/classes/mysql_bindings_spec.rb

@@ -4,7 +4,7 @@
 
 describe 'mysql::bindings' do
   on_supported_os.each do |os, facts|
-    next if facts[:osfamily] == 'Archlinux'
+    next if facts[:os]['family'] == 'Archlinux'
     context "on #{os}" do
       let(:facts) do
         facts.merge(root_home: '/root')