X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/307adfed3045a1673b09bccce74acaaf530d3c9b..edd65c1932befad27142d97ac39c6709f12a715b:/cookbooks/hardware/attributes/default.rb?ds=sidebyside

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index ce7aae863..414983b84 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,10 +1,5 @@
-default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
-                                 %w(lp)
-                               else
-                                 %w(loop lp rtc)
-                               end
-
-default[:hardware][:grub][:cmdline] = %w(nomodeset)
+default[:hardware][:modules] = %w[lp]
+default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]
@@ -13,13 +8,13 @@ if node[:dmi] && node[:dmi][:system]
     default[:apt][:sources] |= ["management-component-pack"]
 
     case node[:dmi][:system][:product_name]
-    when "ProLiant DL360 G6", "ProLiant DL360 G7"
+    when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2"
       default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
   end
 end
 
-if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
+if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]).negative?
   default[:hardware][:modules] |= ["microcode"]
 
   if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
@@ -28,7 +23,7 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
 end
 
 if node[:kernel] && node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid)
+  raidmods = node[:kernel][:modules].keys & %w[cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid]
 
   default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?
 end