additional puppet 4 compatibility

SMX-LTD · Jun 7, 2015 · 42e0b46 · 42e0b46
1 parent 4670766
commit 42e0b46
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -23,17 +23,17 @@
         }
       } else {
         case $::operatingsystemmajrelease {
-          '5': {
+          5: {
             $udev_package    = 'udev'
             $udevtrigger     = 'udevtrigger'
             $udevlogpriority = 'udevcontrol log_priority'
           }
-          '6': {
+          6: {
             $udev_package    = 'udev'
             $udevtrigger     = 'udevadm trigger'
             $udevlogpriority = 'udevadm control --log-priority'
           }
-          '7': {
+          7: {
             $udev_package    = 'systemd'
             $udevtrigger     = 'udevadm trigger'
             $udevlogpriority = 'udevadm control --log-priority'

diff --git a/manifests/udevadm/trigger.pp b/manifests/udevadm/trigger.pp
@@ -19,6 +19,6 @@
 
   exec { $udev::params::udevtrigger:
     refreshonly => true,
-    path        => [$udev::params::udevadm_path],
+    path        => $udev::params::udevadm_path,
   }
 }
diff --git a/spec/classes/params_spec.rb b/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
 

diff --git a/spec/classes/udev_spec.rb b/spec/classes/udev_spec.rb
@@ -27,7 +27,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '6',
+        :operatingsystemmajrelease => 6,
       }
     end
 

diff --git a/spec/classes/udevadm/logpriority_spec.rb b/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
 

diff --git a/spec/classes/udevadm/trigger_spec.rb b/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
 

diff --git a/spec/defines/rule_spec.rb b/spec/defines/rule_spec.rb
@@ -26,7 +26,7 @@
     let :facts do
       {
         :osfamily                  => 'RedHat',
-        :operatingsystemmajrelease => '6',
+        :operatingsystemmajrelease => 6,
       }
     end