Fix repository with redhat based distributions and newer facter only versions

Author: project0

manifests/repository.pp

@@ -10,20 +10,27 @@
 
   $url = "http://download.bareos.org/bareos/release/${release}/"
 
-  $os = $::operatingsystem
-  $osrelease = $::operatingsystemrelease
+  if versioncmp($::puppetversion, '4.0.0') >= 0 {
+    $os = $facts['os']['name']
+    $osrelease = $facts['os']['release']['full']
+    $osmajrelease = $facts['os']['release']['major']
+  } else {
+    $os = $::operatingsystem
+    $osrelease = $::operatingsystemrelease
+    $osmajrelease = $::operatingsystemmajrelease
+  }
 
   case $os {
       /(?i:redhat|centos|fedora)/: {
         case $os {
           'RedHat': {
-            $location = "${url}RHEL_${osrelease}"
+            $location = "${url}RHEL_${osmajrelease}"
           }
           'Centos': {
-            $location = "${url}CentOS_${osrelease}"
+            $location = "${url}CentOS_${osmajrelease}"
           }
           'Fedora': {
-            $location = "${url}Fedora_${osrelease}"
+            $location = "${url}Fedora_${osmajrelease}"
           }
           default: {
             fail('Operatingsystem is not supported by this module')

spec/spec_helper.rb

@@ -3,8 +3,18 @@
 
 RSpec.configure do |c|
   c.default_facts = {
-    operatingsystem: 'Redhat',
-    operatingsystemrelease: '7'
+    operatingsystem: 'RedHat',
+    osfamily: 'RedHat',
+    operatingsystemmajrelease: '7',
+    operatingsystemrelease: '7.0',
+    puppetversion: Puppet.version,
+    :os => {
+      'name' => 'RedHat',
+      'release' => {
+        'full' => '7.0',
+        'major' => '7'
+      },
+    }
   }
   # Coverage generation
   c.after(:suite) do