Use modern facts

Author: ekohl

manifests/init.pp

@@ -68,7 +68,7 @@
 
     if $use_exported_resources {
       # first we export this server's instance
-      @@gluster::peer { $::fqdn:
+      @@gluster::peer { $facts['networking']['fqdn']:
         pool => $pool,
       }
 

manifests/params.pp

@@ -18,17 +18,17 @@
   # Set distro/release specific names, repo versions, repo gpg keys, package versions, etc
   # if the user didn't specify a version, just use "installed" for package version.
   # if they did specify a version, assume they provided a valid one
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       $repo                 = true
       $repo_gpg_key_source  = 'https://raw.githubusercontent.com/CentOS-Storage-SIG/centos-release-storage-common/master/RPM-GPG-KEY-CentOS-SIG-Storage'
 
-      $server_package = $::operatingsystemmajrelease ? {
+      $server_package = $facts['os']['release']['major'] ? {
         # RHEL 6 and 7 provide Gluster packages natively
         /(6|7)/ => 'glusterfs-server',
         default => false
       }
-      $client_package = $::operatingsystemmajrelease ? {
+      $client_package = $facts['os']['release']['major'] ? {
         /(6|7)/ => 'glusterfs-fuse',
         default => false,
       }

manifests/peer.pp

@@ -36,7 +36,7 @@
 #
 define gluster::peer (
   $pool = 'default',
-  $fqdn = $::fqdn,
+  $fqdn = $facts['networking']['fqdn'],
 ) {
 
   # we can't do much without the Gluster binary
@@ -45,7 +45,7 @@
   if getvar('::gluster_binary') {
     # we can't join to ourselves, so it only makes sense to operate
     # on other gluster servers in the same pool
-    if $fqdn != $::fqdn {
+    if $fqdn != $facts['networking']['fqdn'] {
 
       # and we don't want to attach a server that is already a member
       # of the current pool

manifests/repo.pp

@@ -19,7 +19,7 @@
   $release = $gluster::params::release,
   $version = $gluster::params::version,
 ) inherits gluster::params {
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       class { 'gluster::repo::yum':
         release => $release,
@@ -30,6 +30,6 @@
         version  => $version,
       }
     }
-    default: { fail("${::osfamily} not yet supported!") }
+    default: { fail("${facts['os']['family']} not yet supported!") }
   }
 }

manifests/repo/apt.pp

@@ -51,30 +51,30 @@
   } elsif $version =~ /^(\d)\.(\d+)\.(\d+).*$/ {
     $repo_ver =  "${1}.${2}/${1}.${2}.${3}"
   } else {
-    fail("${version} doesn't make sense for ${::operatingsystem}!")
+    fail("${version} doesn't make sense for ${facts['os']['name']}!")
   }
 
   # the Gluster repo only supports x86_64 (amd64) and arm64. The Ubuntu PPA also supports armhf and arm64.
-  case $::operatingsystem {
+  case $facts['os']['name'] {
     'Debian': {
-      case $::lsbdistcodename {
+      case $facts['os']['distro']['codename'] {
         'jessie', 'stretch':  {
-          $arch = $::architecture ? {
+          $arch = $facts['os']['architecture'] ? {
             'amd64'      => 'amd64',
             'arm64'      => 'arm64',
             default      => false,
           }
 
           $_repo_base = 'https://download.gluster.org/pub/gluster/glusterfs'
           $repo_url = if versioncmp($release, '4.1') < 0 {
-            "${_repo_base}/01.old-releases/${release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
+            "${_repo_base}/01.old-releases/${release}/LATEST/Debian/${facts['os']['distro']['codename']}/${arch}/apt/"
           } else {
             $_release = if $release == '4.1' {
               $release
             } else {
               $release[0]
             }
-            "${_repo_base}/${_release}/LATEST/Debian/${::lsbdistcodename}/${arch}/apt/"
+            "${_repo_base}/${_release}/LATEST/Debian/${facts['os']['distro']['codename']}/${arch}/apt/"
           }
         }
         default: {
@@ -88,14 +88,14 @@
   }
 
   unless $arch {
-    fail("Architecture ${::architecture} not yet supported for ${::operatingsystem}.")
+    fail("Architecture ${facts['os']['architecture']} not yet supported for ${facts['os']['name']}.")
   }
 
   $repo = {
     "glusterfs-${version}" => {
       ensure       => present,
       location     => $repo_url,
-      release      => $::lsbdistcodename,
+      release      => $facts['os']['distro']['codename'],
       repos        => 'main',
       key          => {
         id         => $repo_key_name,

manifests/repo/yum.pp

@@ -21,15 +21,15 @@
 ) inherits gluster::params {
 
   # CentOS Gluster repo only supports x86_64
-  if $::architecture != 'x86_64' {
-    fail("Architecture ${::architecture} not yet supported for ${::operatingsystem}.")
+  if $facts['os']['architecture'] != 'x86_64' {
+    fail("Architecture ${facts['os']['architecture']} not yet supported for ${facts['os']['name']}.")
   }
 
   if $priority {
     if ! defined( Package['yum-plugin-priorities'] ) {
       package { 'yum-plugin-priorities':
         ensure => installed,
-        before => Yumrepo["glusterfs-${::architecture}"],
+        before => Yumrepo["glusterfs-${facts['os']['architecture']}"],
       }
     }
   }
@@ -40,15 +40,15 @@
     $release[0]
   }
 
-  yumrepo { "glusterfs-${::architecture}":
+  yumrepo { "glusterfs-${facts['os']['architecture']}":
     enabled  => 1,
-    baseurl  => "http://mirror.centos.org/centos/${::operatingsystemmajrelease}/storage/${::architecture}/gluster-${_release}/",
-    descr    => "CentOS-${::operatingsystemmajrelease} - Gluster ${_release}",
+    baseurl  => "http://mirror.centos.org/centos/${facts['os']['release']['major']}/storage/${facts['os']['architecture']}/gluster-${_release}/",
+    descr    => "CentOS-${facts['os']['release']['major']} - Gluster ${_release}",
     gpgcheck => 1,
     gpgkey   => $repo_key_source,
     priority => $priority,
   }
 
-  Yumrepo["glusterfs-${::architecture}"] -> Package<| tag == 'gluster-packages' |>
+  Yumrepo["glusterfs-${facts['os']['architecture']}"] -> Package<| tag == 'gluster-packages' |>
 
 }

spec/classes/install_spec.rb

@@ -56,16 +56,17 @@
       end
       context 'installing on an unsupported architecture' do
         let :facts do
-          super().merge(
-            architecture: 'zLinux'
-          )
+          # deep_merge modifies facts in place
+          facts = super().dup
+          facts[:os] = facts[:os].merge(architecture: 'zLinux')
+          facts
         end
 
         case facts[:osfamily]
         when 'Archlinux', 'Suse'
           it { is_expected.not_to create_class('gluster::repo') }
         else
-          it { is_expected.to raise_error(Puppet::Error, %r{not yet supported}) }
+          it { is_expected.to compile.and_raise_error(%r{not yet supported}) }
         end
       end
     end

spec/classes/repo_apt_spec.rb

@@ -2,7 +2,7 @@
 
 describe 'gluster::repo::apt', type: :class do
   on_supported_os.each do |os, os_facts|
-    context "on #{os}", if: os_facts[:osfamily] == 'Debian' do
+    context "on #{os}", if: os_facts[:os]['family'] == 'Debian' do
       let(:facts) { os_facts }
       let(:pre_condition) { 'require gluster::params' }
 
@@ -17,17 +17,20 @@
           )
         end
       end
+
       context 'unsupported architecture' do
-        let :facts do
-          super().merge(
-            architecture: 'zLinux'
-          )
+        let(:facts) do
+          # deep_merge modifies the facts in place
+          facts = super().dup
+          facts[:os] = facts[:os].merge(architecture: 'zLinux')
+          facts
         end
 
         it 'does not install' do
           is_expected.to compile.and_raise_error(%r{Architecture zLinux not yet supported})
         end
       end
+
       context 'latest Gluster with priority' do
         let :params do
           {

spec/defines/peer_spec.rb

@@ -99,7 +99,9 @@
         gluster_binary: '/usr/sbin/gluster',
         gluster_peer_count: 0,
         gluster_peer_list: '',
-        fqdn: 'peer1.example.com'
+        networking: {
+          fqdn: 'peer1.example.com'
+        }
       }
     end