X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/868dbb785525168c1d36f121bf83ebdd6c1aba51..ff3f8dc9ce8547b72b4665514ceee45f39edbad2:/cookbooks/hardware/attributes/default.rb diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index f77967a20..fb19506f4 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -1,12 +1,14 @@ default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04 - %w(lp) + %w[lp] else - %w(loop lp rtc) + %w[loop lp rtc] end -default[:hardware][:grub][:cmdline] = %w(nomodeset) +default[:hardware][:grub][:cmdline] = %w[nomodeset] default[:hardware][:sensors] = {} +default[:hardware][:mcelog][:enabled] = true + if node[:dmi] && node[:dmi][:system] case node[:dmi][:system][:manufacturer] when "HP" @@ -19,7 +21,7 @@ if node[:dmi] && node[:dmi][:system] 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,11 +30,9 @@ 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] - unless raidmods.empty? - default[:apt][:sources] |= ["hwraid"] - end + default[:apt][:sources] |= ["hwraid"] unless raidmods.empty? end if node[:kernel][:modules].include?("ipmi_si")