Merge pull request #251 from UGent-DICT/feature/we_say_no_to_topscope_vars

Stop using $::osfamily but use $facts['osfamily']

Author: vStone

manifests/bond.pp

@@ -167,7 +167,7 @@
     source => 'bonding',
   }
 
-  case $::osfamily {
+  case $facts['osfamily'] {
     'Debian': {
       network::bond::debian { $name:
         ensure           => $ensure,
@@ -221,7 +221,7 @@
       }
     }
     default: {
-      fail("network::bond does not support osfamily '${::osfamily}'")
+      fail("network::bond does not support osfamily '${facts['osfamily']}'")
     }
   }
 }

manifests/bond/setup.pp

@@ -1,7 +1,7 @@
 # make it work on debian..
 class network::bond::setup {
 
-  case $::osfamily {
+  case $facts['osfamily'] {
     'Debian': {
       package { 'ifenslave-2.6':
         ensure => present,

manifests/init.pp

@@ -64,7 +64,7 @@
   $ensure_ipaddress        = present,
 ) {
 
-  if $::osfamily == 'Debian' and $manage_ifupdown_extra {
+  if $facts['osfamily'] == 'Debian' and $manage_ifupdown_extra {
     package { $ifupdown_extra:
       ensure   => $ensure_ifupdown_extra,
       provider => $ifupdown_extra_provider,

spec/defines/bond_spec.rb

@@ -64,7 +64,7 @@
       let(:facts) { { osfamily: 'SparrowOS' } }
 
       it 'fails to compile' do
-        expect { is_expected.to compile }.to raise_error(%r{network::bond does not support osfamily 'SparrowOS'})
+        is_expected.to compile.and_raise_error(%r{network::bond does not support osfamily 'SparrowOS'})
       end
     end
   end