From 6c13c64654da0635ab201ddd20c7cbf365470e13 Mon Sep 17 00:00:00 2001
From: "Alexander J. Maidak" <maidakalexanderj@johndeere.com>
Date: Fri, 4 Mar 2016 14:53:31 -0600
Subject: [PATCH 1/2] operatingsystemmajrelease fact is a string

Fix params.pp for 4x parser.  The puppet 4x parser is type sensitive,
strings are not magically converted to ints and vice-versa.  The
operatingsystemmajrelease fact is returned by facter as a string:
https://tickets.puppetlabs.com/browse/FACT-962
---
 manifests/params.pp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 6d6545a..1dca377 100644
--- 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'

From 8d595c79977f174e9d06c32a2559af56ae96afcd Mon Sep 17 00:00:00 2001
From: "Alexander J. Maidak" <maidakalexanderj@johndeere.com>
Date: Mon, 7 Mar 2016 11:21:55 -0600
Subject: [PATCH 2/2] Cleanup tests for int->string conversion on facts

4x does not magically convert between ints and strings
for facts.
---
 spec/classes/params_spec.rb              | 4 ++--
 spec/classes/udev_spec.rb                | 2 +-
 spec/classes/udevadm/logpriority_spec.rb | 4 ++--
 spec/classes/udevadm/trigger_spec.rb     | 4 ++--
 spec/defines/rule_spec.rb                | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/spec/classes/params_spec.rb b/spec/classes/params_spec.rb
index 3ca51a2..4b9f0cb 100644
--- 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
index 771921f..86d8f39 100644
--- 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
index a1b8b10..d81ac9e 100644
--- 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
index 2ea8b01..040f63e 100644
--- 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
index 4a0259a..fb77f9e 100644
--- 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