Remove legacy facts

manifests/apt.pp

@@ -26,7 +26,7 @@
   $dpkg_opts = '-o DPkg::Options="--force-confold"',
   $cache     = '/var/cache/apt',
 ){
-  if $::osfamily != 'Debian' {
+  if $facts['os']['family'] != 'Debian' {
     fail("This class only supported on Debian-based platforms.\n")
   }
 

manifests/apt/mirror.pp

@@ -21,47 +21,47 @@
   $repositories = [
     {
       'uri'          => $uri,
-      'distribution' => $::lsbdistcodename,
+      'distribution' => $facts['os']['distro']['codename'],
       'components'   => ['main', 'restricted'],
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-updates",
+      'distribution' => "${facts['os']['distro']['codename']}-updates",
       'components'   => ['main', 'restricted'],
     },
     {
       'uri'          => $uri,
-      'distribution' => $::lsbdistcodename,
+      'distribution' => $facts['os']['distro']['codename'],
       'components'   => 'universe',
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-updates",
+      'distribution' => "${facts['os']['distro']['codename']}-updates",
       'components'   => 'universe',
     },
     {
       'uri'          => $uri,
-      'distribution' => $::lsbdistcodename,
+      'distribution' => $facts['os']['distro']['codename'],
       'components'   => 'multiverse',
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-updates",
+      'distribution' => "${facts['os']['distro']['codename']}-updates",
       'components'   => 'multiverse',
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-security",
+      'distribution' => "${facts['os']['distro']['codename']}-security",
       'components'   => ['main', 'restricted'],
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-security",
+      'distribution' => "${facts['os']['distro']['codename']}-security",
       'components'   => 'universe',
     },
     {
       'uri'          => $uri,
-      'distribution' => "${::lsbdistcodename}-security",
+      'distribution' => "${facts['os']['distro']['codename']}-security",
       'components'   => 'multiverse',
     },
   ]

manifests/bash/params.pp

@@ -3,7 +3,7 @@
 # Platform-dependent parameters for the bash shell.
 #
 class sys::bash::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       # Bash is included by default on OS X.
       $package = false
@@ -36,7 +36,7 @@
       $defpath  = '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
     }
     default: {
-      fail("Don't know how to install bash on ${::osfamily}.\n")
+      fail("Don't know how to install bash on ${facts['os']['family']}.\n")
     }
   }
 }

manifests/bash/rc.pp

@@ -47,7 +47,7 @@
   $extra      = undef,
   $path       = undef,
   $pythonpath = undef,
-  $template   = "sys/bash/${::osfamily}.erb",
+  $template   = "sys/bash/${facts['os']['family']}.erb",
 ) {
   include sys::bash
 
@@ -104,7 +104,7 @@
     require => File["${homedir}/.bashrc"],
   }
 
-  if $::operatingsystem == 'Solaris' {
+  if $facts['os']['name'] == 'Solaris' {
     file { "${homedir}/.zfs_completion":
       ensure => $file_ensure,
       mode   => '0600',

manifests/curl/params.pp

@@ -3,7 +3,7 @@
 # Platform-dependent parameters for curl.
 #
 class sys::curl::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       # Curl included by default on OS X.
       $package = false

manifests/dkms.pp

@@ -18,7 +18,7 @@
     fail("DKMS support is only for Linux kernels.\n")
   }
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     # DKMS is in EPEL.
     include sys::redhat::epel
     Class['sys::redhat::epel'] -> Package[$package]

manifests/fetch.pp

@@ -44,15 +44,15 @@
   $user         = undef,
 ) {
 
-  if ($redownload and $::osfamily != 'windows') {
+  if ($redownload and $facts['os']['family'] != 'windows') {
     $unless  = "test -s ${destination}"
     $creates = undef
   } else {
     $unless  = undef
     $creates = $destination
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       # Use cURL on OS X.
       if $cert_check {
@@ -83,7 +83,7 @@
     }
   }
 
-  if $::osfamily == 'windows' {
+  if $facts['os']['family'] == 'windows' {
     $command = "(New-Object Net.WebClient).DownloadFile('${source}', '${destination}')"
   } else {
     # Constructing download options string using stdlib's `join` function.

manifests/gcc/params.pp

@@ -3,7 +3,7 @@
 # Platform-dependent parameters for GCC.
 #
 class sys::gcc::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     openbsd: {
       # GCC included by default on OpenBSD.
       $packages = false
@@ -18,7 +18,7 @@
       $packages = ['gcc', 'gcc-c++', 'make']
     }
     default: {
-      fail("Do not know how to install/configure GCC on ${::osfamily}.\n")
+      fail("Do not know how to install/configure GCC on ${facts['os']['family']}.\n")
     }
   }
 }

manifests/git.pp

@@ -37,7 +37,7 @@
   $win_path        = $sys::git::params::win_path,
 ) inherits sys::git::params {
   # Extra gymnastics necessary if on windows.
-  if $::osfamily == 'windows' {
+  if $facts['os']['family'] == 'windows' {
     # If a source is passed in, use it -- this can be a HTTP URL or UNC.
     if $source {
       $source_uri = $source
@@ -66,7 +66,7 @@
         require   => Package[$package],
       }
 
-      if $::architecture == 'x64' {
+      if $facts['os']['architecture'] == 'x64' {
         # Git now has native 64-bit support, remove 32-path.
         windows::path { 'git-path-legacy':
           ensure    => absent,

manifests/git/params.pp

@@ -3,7 +3,7 @@
 # Platform-dependent parameters for git.
 #
 class sys::git::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     openbsd: {
       include sys::openbsd::pkg
       $package  = 'git'
@@ -25,7 +25,7 @@
       $release_tag = "v${version}.windows.1"
       $base_url = "https://github.com/git-for-windows/git/releases/download/${release_tag}/"
 
-      if $::architecture == 'x64' {
+      if $facts['os']['architecture'] == 'x64' {
         $basename = "Git-${version}-64-bit.exe"
       } else {
         $basename = "Git-${version}-32-bit.exe"
@@ -36,7 +36,7 @@
       $win_path = 'C:\Program Files\Git\cmd'
     }
     default: {
-      fail("Do not know how to install git on ${::osfamily}.\n")
+      fail("Do not know how to install git on ${facts['os']['family']}.\n")
     }
   }
 }

manifests/htop/params.pp

@@ -3,15 +3,15 @@
 # Platform-dependent parameters for installing htop.
 #
 class sys::htop::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     debian: {
       $package = 'htop'
     }
     redhat: {
       $package = 'htop'
     }
     default: {
-      fail("Do not know how to install htop on ${::osfamily}.")
+      fail("Do not know how to install htop on ${facts['os']['family']}.")
     }
   }
 }

manifests/init.pp

@@ -10,7 +10,7 @@
 #
 class sys {
   # Settings for the root and binary groups.
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       $binary_group = 'wheel'
       $root_group   = 'wheel'
@@ -34,7 +34,7 @@
   }
 
   # The root home directory is different on OS X.
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       $root_home = '/var/root'
     }
@@ -44,7 +44,7 @@
   }
 
   # If we're on Debian-based systems, they use 'nogroup' instead of 'nobody'.
-  case $::osfamily {
+  case $facts['os']['family'] {
     debian: {
       $nobody_group = 'nogroup'
     }

manifests/luks/params.pp

@@ -3,12 +3,12 @@
 # Platform-dependent parameters for LUKS.
 #
 class sys::luks::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     debian: {
       $package = 'cryptsetup'
     }
     redhat: {
-      case $::operatingsystemmajrelease {
+      case $facts['os']['release']['major'] {
         7: {
           $package = 'cryptsetup'
         }
@@ -21,7 +21,7 @@
       $package = 'cryptsetup'
     }
     default: {
-      fail("Do not know how to install LUKS on ${::osfamily}.\n")
+      fail("Do not know how to install LUKS on ${facts['os']['family']}.\n")
     }
   }
 }

manifests/nfs/params.pp

@@ -3,7 +3,7 @@
 # Platform-independent parameters for installing NFS client and/or server.
 #
 class sys::nfs::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     darwin: {
       # NFS client and server built-in to OS X.
       $client = false
@@ -26,7 +26,7 @@
       $provider = 'pkg'
     }
     default: {
-      fail("Do not know how to install NFS on ${::osfamily}\n")
+      fail("Do not know how to install NFS on ${facts['os']['family']}\n")
     }
   }
 }

manifests/openbsd/dnsmasq.pp

@@ -50,7 +50,7 @@
   $config             = '/etc/dnsmasq.conf',
   $cache_size         = '750',
   $default_lease      = '24h',
-  $domain             = $::domain,
+  $domain             = $facts['networking']['domain'],
   $expand_hosts       = true,
   $etc_hosts          = '/etc/hosts',
   $except_interfaces  = [],

manifests/openbsd/params.pp

@@ -4,5 +4,5 @@
 #
 class sys::openbsd::params {
   # The default mirror for OpenBSD packages.
-  $mirror = "http://ftp3.usa.openbsd.org/pub/OpenBSD/${::kernelmajversion}/packages/${::architecture}/"
+  $mirror = "http://ftp3.usa.openbsd.org/pub/OpenBSD/${::kernelmajversion}/packages/${facts['os']['architecture']}/"
 }

manifests/parted/params.pp

@@ -3,15 +3,15 @@
 # Platform-dependent parameters for installing GNU parted.
 #
 class sys::parted::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     debian: {
       $package = 'parted'
     }
     redhat: {
       $package = 'parted'
     }
     default: {
-      fail("Do not know how to install parted on ${::osfamily}.")
+      fail("Do not know how to install parted on ${facts['os']['family']}.")
     }
   }
 }

manifests/redhat/epel.pp

@@ -4,7 +4,7 @@
 #
 class sys::redhat::epel {
   # Getting the right RPM depending on this RedHat release.
-  case $::operatingsystemrelease {
+  case $facts['os']['release']['full'] {
     /^5\.\d+$/: {
       $epel_name = 'epel-release-5-4'
       $epel_rpm  = "http://download.fedoraproject.org/pub/epel/5/i386/${epel_name}.noarch.rpm"
@@ -18,7 +18,7 @@
       $epel_rpm  = "http://download.fedoraproject.org/pub/epel/7/x86_64/e/${epel_name}.noarch.rpm"
     }
     default: {
-      fail("Do not know how to install EPEL on RedHat release: ${::operatingsystemrelease}.\n")
+      fail("Do not know how to install EPEL on RedHat release: ${facts['os']['release']['full']}.\n")
     }
   }
 

manifests/rsync/params.pp

@@ -7,7 +7,7 @@
   $package = 'rsync'
   $service = 'rsync'
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     openbsd: {
       include sys::openbsd::pkg
       $provider = undef

manifests/screen/params.pp

@@ -3,7 +3,7 @@
 # Platform-dependent parameters for installing screen.
 #
 class sys::screen::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     openbsd: {
       include sys::openbsd::pkg
       $package = 'screen'

manifests/screen/rc.pp

@@ -34,7 +34,7 @@
   $group    = undef,
   $home     = undef,
   $extra    = undef,
-  $template = "sys/screen/${::osfamily}.erb",
+  $template = "sys/screen/${facts['os']['family']}.erb",
 ) {
   include sys::screen
 

manifests/solaris.pp

@@ -3,7 +3,7 @@
 # Module for Solaris 11 and Illumos derivatives (e.g., OpenIndiana, OmniOS).
 #
 class sys::solaris {
-  if $::osfamily != 'Solaris' or versioncmp($::kernelrelease, '5.11') < 0 {
+  if $facts['os']['family'] != 'Solaris' or versioncmp($::kernelrelease, '5.11') < 0 {
     fail('Only Solaris 11+ and Illumos kernels are supported.\n')
   }