Use $facts hash instead of topscope variables

voxpupuli · Nov 6, 2017 · 4489e60 · 4489e60
1 parent 15a028f
commit 4489e60
Show file tree

Hide file tree

Showing 35 changed files with 44 additions and 44 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -26,12 +26,12 @@
   $plugin_conf_dir_mode      = '0750'
   $ci_package_repo           = undef
 
-  case getvar('::kernel') {
-    'OpenBSD': { $has_wordexp   = false }
-    default: { $has_wordexp   = true }
+  case $facts['kernel'] {
+    'OpenBSD': { $has_wordexp = false }
+    default:   { $has_wordexp = true }
   }
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'Debian': {
       $package_name       = [ 'collectd', 'collectd-core' ]
       $package_provider   = 'apt'
@@ -130,7 +130,7 @@
     }
 
     default: {
-      fail("${::osfamily} is not supported.")
+      fail("${facts['os']['family']} is not supported.")
     }
   }
 

diff --git a/manifests/plugin/amqp.pp b/manifests/plugin/amqp.pp
@@ -23,7 +23,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-amqp':
         ensure => $ensure,

diff --git a/manifests/plugin/apache.pp b/manifests/plugin/apache.pp
@@ -11,7 +11,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-apache':
         ensure          => $ensure,

diff --git a/manifests/plugin/bind.pp b/manifests/plugin/bind.pp
@@ -18,7 +18,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-bind':
         ensure => $ensure,

diff --git a/manifests/plugin/cuda.pp b/manifests/plugin/cuda.pp
@@ -29,7 +29,7 @@
         require => Package['python-pip'],
       }
 
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {

diff --git a/manifests/plugin/curl.pp b/manifests/plugin/curl.pp
@@ -10,7 +10,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-curl':
         ensure => $ensure,

diff --git a/manifests/plugin/curl_json.pp b/manifests/plugin/curl_json.pp
@@ -24,15 +24,15 @@
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
   if $_manage_package {
-    if $::osfamily == 'Debian' {
-      $libyajl_package = $::lsbdistcodename ? {
+    if $facts['os']['family'] == 'Debian' {
+      $libyajl_package = $facts['os']['lsb']['distcodename'] ? {
         'precise' => 'libyajl1',
         default   => 'libyajl2'
       }
       ensure_packages($libyajl_package)
     }
 
-    if $::osfamily == 'RedHat' {
+    if $facts['os']['family'] == 'RedHat' {
       ensure_packages('collectd-curl_json')
     }
   }

diff --git a/manifests/plugin/dbi.pp b/manifests/plugin/dbi.pp
@@ -12,7 +12,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-dbi':
         ensure => $ensure,

diff --git a/manifests/plugin/disk.pp b/manifests/plugin/disk.pp
@@ -11,7 +11,7 @@
 
   include ::collectd
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $manage_package != undef {
       $_manage_package = $manage_package
     } else {

diff --git a/manifests/plugin/genericjmx.pp b/manifests/plugin/genericjmx.pp
@@ -13,7 +13,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-generic-jmx':
         ensure => $ensure,

diff --git a/manifests/plugin/ipmi.pp b/manifests/plugin/ipmi.pp
@@ -15,7 +15,7 @@
 
   $manage_package_real = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $manage_package_real {
       package { 'collectd-ipmi':
         ensure => $ensure_package,

diff --git a/manifests/plugin/iptables.pp b/manifests/plugin/iptables.pp
@@ -12,7 +12,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-iptables':
         ensure => $ensure_package,

diff --git a/manifests/plugin/iscdhcp.pp b/manifests/plugin/iscdhcp.pp
@@ -28,7 +28,7 @@
         require => Package['python-pip'],
       }
 
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {

diff --git a/manifests/plugin/java.pp b/manifests/plugin/java.pp
@@ -12,7 +12,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-java':
         ensure => $ensure,

diff --git a/manifests/plugin/lvm.pp b/manifests/plugin/lvm.pp
@@ -15,7 +15,7 @@
     $ensure_real = 'absent'
   }
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-lvm':
         ensure => $ensure_real,

diff --git a/manifests/plugin/mysql.pp b/manifests/plugin/mysql.pp
@@ -10,7 +10,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-mysql':
         ensure => $ensure,

diff --git a/manifests/plugin/netlink.pp b/manifests/plugin/netlink.pp
@@ -15,7 +15,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-netlink':
         ensure => $ensure,

diff --git a/manifests/plugin/nginx.pp b/manifests/plugin/nginx.pp
@@ -15,7 +15,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-nginx':
         ensure => $ensure,

diff --git a/manifests/plugin/perl.pp b/manifests/plugin/perl.pp
@@ -12,7 +12,7 @@
 
   $conf_dir = $collectd::plugin_conf_dir
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-perl':
         ensure => $ensure,

diff --git a/manifests/plugin/ping.pp b/manifests/plugin/ping.pp
@@ -15,7 +15,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-ping':
         ensure => $ensure,

diff --git a/manifests/plugin/postgresql.pp b/manifests/plugin/postgresql.pp
@@ -12,7 +12,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-postgresql':
         ensure => $ensure,

diff --git a/manifests/plugin/rabbitmq.pp b/manifests/plugin/rabbitmq.pp
@@ -61,7 +61,7 @@
 ) {
   include ::collectd
 
-  case $::osfamily {
+  case $facts['os']['family'] {
     'RedHat': {
       $_custom_types_db = '/usr/share/collectd-rabbitmq/types.db.custom'
     }
@@ -81,7 +81,7 @@
         require => Package['python-pip'],
       }
 
-      if $::osfamily == 'RedHat' {
+      if $facts['os']['family'] == 'RedHat' {
         # Epel is installed in install.pp if manage_repo is true
         # python-pip doesn't exist in base for RedHat. Need epel installed first
         if (defined(Class['::epel'])) {

diff --git a/manifests/plugin/redis.pp b/manifests/plugin/redis.pp
@@ -22,7 +22,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-redis':
         ensure => $ensure,

diff --git a/manifests/plugin/rrdcached.pp b/manifests/plugin/rrdcached.pp
@@ -19,7 +19,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-rrdcached':
         ensure => $ensure,

diff --git a/manifests/plugin/rrdtool.pp b/manifests/plugin/rrdtool.pp
@@ -17,7 +17,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-rrdtool':
         ensure => $ensure,

diff --git a/manifests/plugin/sensors.pp b/manifests/plugin/sensors.pp
@@ -12,7 +12,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-sensors':
         ensure => $ensure,

diff --git a/manifests/plugin/smart.pp b/manifests/plugin/smart.pp
@@ -10,7 +10,7 @@
 
   include ::collectd
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $manage_package != undef {
       $_manage_package = $manage_package
     } else {

diff --git a/manifests/plugin/snmp.pp b/manifests/plugin/snmp.pp
@@ -11,7 +11,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-snmp':
         ensure => $ensure,

diff --git a/manifests/plugin/varnish.pp b/manifests/plugin/varnish.pp
@@ -13,7 +13,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-varnish':
         ensure => $ensure,

diff --git a/manifests/plugin/virt.pp b/manifests/plugin/virt.pp
@@ -17,7 +17,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-virt':
         ensure => $ensure,

diff --git a/manifests/plugin/write_riemann.pp b/manifests/plugin/write_riemann.pp
@@ -18,7 +18,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-write_riemann':
         ensure => $ensure,

diff --git a/manifests/plugin/write_sensu.pp b/manifests/plugin/write_sensu.pp
@@ -16,7 +16,7 @@
 
   $_manage_package = pick($manage_package, $::collectd::manage_package)
 
-  if $::osfamily == 'RedHat' {
+  if $facts['os']['family'] == 'RedHat' {
     if $_manage_package {
       package { 'collectd-write_sensu':
         ensure => $ensure,

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -3,12 +3,12 @@
 class collectd::repo {
 
   if $collectd::manage_repo {
-    $osfamily_downcase = downcase($::osfamily)
+    $osfamily_downcase = downcase($facts['os']['family'])
 
     if defined("::collectd::repo::${osfamily_downcase}") {
       require "::collectd::repo::${osfamily_downcase}"
     } else {
-      notify{"You have asked to manage_repo on a system that doesn't have a repo class specified: ${::osfamily}":}
+      notify{"You have asked to manage_repo on a system that doesn't have a repo class specified: ${facts['os']['family']}":}
     }
   }
 

diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
@@ -13,8 +13,8 @@
       },
     }
   } else {
-    if $::operatingsystem == 'Debian' {
-      warning('Youre trying to use the Ubuntu PPA on a Debian Server, which may cause errors')
+    if $facts['os']['name'] == 'Debian' {
+      warning('You\'re trying to use the Ubuntu PPA on a Debian Server, which may cause errors')
       warning('We recommend you to use the $ci_package_repo parameter if you want to use an upstream repo on Debian')
     } else {
       apt::source { 'ppa_collectd':

diff --git a/spec/classes/collectd_init_spec.rb b/spec/classes/collectd_init_spec.rb
@@ -253,7 +253,7 @@
           it { is_expected.to contain_file('collectd.conf').with_content(%r{Hello World}) }
         end
         context 'on non supported operating systems' do
-          let(:facts) { { osfamily: 'foo' } }
+          let(:facts) { { os: { family: 'foo' } } }
 
           it 'fails' do
             is_expected.to compile.and_raise_error(%r{foo is not supported})