Reinstate the operatingsystem check.

jhoblitt · Jul 31, 2014 · afd6ec5 · afd6ec5
1 parent 6cab5a5
commit afd6ec5
Showing 1 changed file with 22 additions and 21 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -5,39 +5,40 @@
 class udev::params {
   $udevadm_path = '/sbin'
 
-  case $::operatingsystem {
+  case $::osfamily {
     'debian': {
       $udev_package = 'udev'
       $udevlogpriority = 'udevadm control --log-priority'
       $udevtrigger     = 'udevadm trigger'
     }
     'redhat': {
-      case $::operatingsystemmajrelease {
-        '5': {
-          $udev_package = 'udev'
-          $udevtrigger     = 'udevtrigger'
-          $udevlogpriority = 'udevcontrol log_priority'
-        }
-        '6','7': {
-          $udev_package = 'udev'
+      if $::operatingsystem == 'Fedora' {
+        if ($::operatingsystemmajrelease >= 20) {
+          $udev_package    = 'systemd'
           $udevtrigger     = 'udevadm trigger'
           $udevlogpriority = 'udevadm control --log-priority'
         }
-        default: {
-          fail("Module ${module_name} is not supported on RedHat release ${::operatingsystemmajrelease}")
+        else {
+          fail("Module ${module_name} might not be supported on Fedora release ${::operatingsystemmajrelease}")
         }
-      }
-    }
-    'fedora': {
-      if ($::operatingsystemmajrelease >= 20) {
-        $udev_package    = 'systemd'
-        $udevtrigger     = 'udevadm trigger'
-        $udevlogpriority = 'udevadm control --log-priority'
-      }
-      else {
-        fail("Module ${module_name} might not be supported on Fedora release ${::operatingsystemmajrelease}")
+      } else {
+        case $::operatingsystemmajrelease {
+          '5': {
+            $udev_package = 'udev'
+            $udevtrigger     = 'udevtrigger'
+            $udevlogpriority = 'udevcontrol log_priority'
+          }
+          '6','7': {
+            $udev_package = 'udev'
+            $udevtrigger     = 'udevadm trigger'
+            $udevlogpriority = 'udevadm control --log-priority'
+          }
+          default: {
+            fail("Module ${module_name} is not supported on RedHat release ${::operatingsystemmajrelease}")
+          }
         }
       }
+    }
     default: {
       fail("Module ${module_name} is not supported on ${::operatingsystem}")
     }