Merge branch 'sam-wouters-master'

README.md

@@ -114,6 +114,7 @@ file (one without any fragments).
 
 * el6.x
 * el5.x
+* el7.x
 * Debian/Ubuntu
 
 ### Puppet Version Compatibility

manifests/params.pp

@@ -7,7 +7,7 @@
 
   case $::osfamily {
     'debian': {
-      $udev_package = 'udev'
+      $udev_package    = 'udev'
       $udevlogpriority = 'udevadm control --log-priority'
       $udevtrigger     = 'udevadm trigger'
     }
@@ -23,13 +23,18 @@
         }
       } else {
         case $::operatingsystemmajrelease {
-          '5': {
-            $udev_package = 'udev'
+          5: {
+            $udev_package    = 'udev'
             $udevtrigger     = 'udevtrigger'
             $udevlogpriority = 'udevcontrol log_priority'
           }
-          '6','7': {
-            $udev_package = 'udev'
+          6: {
+            $udev_package    = 'udev'
+            $udevtrigger     = 'udevadm trigger'
+            $udevlogpriority = 'udevadm control --log-priority'
+          }
+          7: {
+            $udev_package    = 'systemd'
             $udevtrigger     = 'udevadm trigger'
             $udevlogpriority = 'udevadm control --log-priority'
           }

manifests/udevadm/trigger.pp

@@ -19,6 +19,6 @@
 
   exec { $udev::params::udevtrigger:
     refreshonly => true,
-    path        => [$udev::params::udevadm_path],
+    path        => $udev::params::udevadm_path,
   }
 }

metadata.json

@@ -12,21 +12,24 @@
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
         "5",
-        "6"
+        "6",
+        "7"
       ]
     },
     {

spec/acceptance/udev_spec.rb

@@ -1,6 +1,16 @@
 require 'spec_helper_acceptance'
 
 describe 'udev class' do
+  maj = fact_on 'master', 'operatingsystemmajrelease'
+
+  package_name = nil
+  case maj.to_i
+  when 5, 6
+    package_name = 'udev'
+  when 7
+    package_name = 'systemd'
+  end
+
   describe 'running puppet code' do
     it 'should work with no errors' do
       pp = <<-EOS
@@ -21,7 +31,7 @@ class { 'udev': udev_log => 'debug' }
     end
   end
 
-  describe package('udev') do
+  describe package(package_name) do
     it { should be_installed }
   end
 

spec/classes/params_spec.rb

@@ -5,7 +5,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '6',
+        :operatingsystemmajrelease => 6,
       }
     end
 
@@ -17,7 +17,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '4',
+        :operatingsystemmajrelease => 4,
       }
     end
 

spec/classes/udev_spec.rb

@@ -27,7 +27,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '6',
+        :operatingsystemmajrelease => 6,
       }
     end
 

spec/classes/udevadm/logpriority_spec.rb

@@ -31,7 +31,7 @@
   describe 'for osfamily RedHat and operatingsystemmajrelease 6' do
     let(:facts) do
         { :osfamily                  => 'RedHat',
-          :operatingsystemmajrelease => '6',
+          :operatingsystemmajrelease => 6,
         }
     end
 
@@ -66,7 +66,7 @@
   describe 'for osfamily RedHat and operatingsystemmajrelease 5' do
     let(:facts) do
         { :osfamily                  => 'RedHat',
-          :operatingsystemmajrelease => '5',
+          :operatingsystemmajrelease => 5,
         }
     end
 

spec/classes/udevadm/trigger_spec.rb

@@ -5,7 +5,7 @@
   describe 'for osfamily RedHat' do
     let(:facts) do
         { :osfamily                  => 'RedHat',
-          :operatingsystemmajrelease => '6',
+          :operatingsystemmajrelease => 6,
         }
     end
 
@@ -21,7 +21,7 @@
   describe 'for osfamily RedHat' do
     let(:facts) do
         { :osfamily                  => 'RedHat',
-          :operatingsystemmajrelease => '5',
+          :operatingsystemmajrelease => 5,
         }
     end
 

spec/defines/rule_spec.rb

@@ -26,7 +26,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '6',
+        :operatingsystemmajrelease => 6,
       }
     end