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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 2a4e8e272..fb19506f4 100644
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,36 +1,42 @@
-default[:hardware][:modules] = [ "loop", "lp", "rtc" ]
+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][:sensors] = {}
 
-if node[:dmi] and node[:dmi][:system]
-  case dmi.system.manufacturer
+default[:hardware][:mcelog][:enabled] = true
+
+if node[:dmi] && node[:dmi][:system]
+  case node[:dmi][:system][:manufacturer]
   when "HP"
-    default[:apt][:sources] |= [ "management-component-pack" ]
+    default[:apt][:sources] |= ["management-component-pack"]
 
-    case dmi.system.product_name
-      when "ProLiant DL360 G6", "ProLiant DL360 G7"
-        default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }
+    case node[:dmi][:system][:product_name]
+    when "ProLiant DL360 G6", "ProLiant DL360 G7"
+      default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
   end
 end
 
-if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
-  default[:hardware][:modules] |= [ "microcode" ]
+if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]).negative?
+  default[:hardware][:modules] |= ["microcode"]
 
-  if node[:cpu]["0"][:vendor_id] == "GenuineIntel"
-    default[:hardware][:modules] |= [ "coretemp" ]
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= ["coretemp"]
   end
 end
 
-if node[:kernel] and node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+if node[:kernel] && node[:kernel][:modules]
+  raidmods = node[:kernel][:modules].keys & %w[cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid]
 
-  unless raidmods.empty?
-    default[:apt][:sources] |= [ "hwraid" ]
-  end
+  default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?
 end
 
 if node[:kernel][:modules].include?("ipmi_si")
-  default[:hardware][:modules] |= [ "ipmi_devintf" ]
+  default[:hardware][:modules] |= ["ipmi_devintf"]
 end
 
 if File.exist?("/proc/xen")