#143 Bring all instances into line

lib/facter/os_patching.rb

@@ -249,31 +249,24 @@
     end
 
     # Should we patch if there are warnings?
-    chunk(:block_patching_on_warning) do
+    chunk(:block_patching_on_warnings) do
       data = {}
-      abort_on_warningfile = os_patching_dir + '/block_patching_on_warning'
-      if File.file?(abort_on_warningfile)
-        data['block_patching_on_warning'] = 'true'
+      abort_on_warningsfile = os_patching_dir + '/block_patching_on_warnings'
+      if File.file?(abort_on_warningsfile)
+        data['block_patching_on_warnings'] = 'true'
         if not warnings.empty?
           blocked = true
           blocked_reasons.push warnings
         end
         data['blocked'] = blocked
         data['blocked_reasons'] = blocked_reasons
       else
-        data['block_patching_on_warning'] = 'false'
+        data['block_patching_on_warnings'] = 'false'
         data['warnings'] = warnings
         data['blocked'] = blocked
         data['blocked_reasons'] = blocked_reasons
       end
       data
     end
-
-    #chunk(:warnings) do
-    #  data = {}
-    #  data['warnings'] = warnings
-    #  data
-    #end
-
   end
 end

manifests/init.pp

@@ -225,7 +225,7 @@
     content => $patch_window,
   }
 
-  file { "${cache_dir}/block_patching_on_warning":
+  file { "${cache_dir}/block_patching_on_warnings":
     ensure  => $block_patching_ensure,
     notify  => Exec[$fact_exec],
   }