Merge remote-tracking branch 'github/pull/202'

[chef.git] / cookbooks / hardware / attributes / default.rb

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index f77967a208604013e7ca5f50858f6a744748a23a..2527e16224a13c5e5b720a1079145313f0518d39 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,25 +1,27 @@
 default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
 default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04

-                                 %w(lp)
+                                 %w[lp]

                                else
                                else

-                                 %w(loop lp rtc)
+                                 %w[loop lp rtc]

                                end
 
                                end
 

-default[:hardware][:grub][:cmdline] = %w(nomodeset)
+default[:hardware][:grub][:cmdline] = %w[nomodeset]

 default[:hardware][:sensors] = {}
 
 default[:hardware][:sensors] = {}
 

+default[:hardware][:mcelog][:enabled] = node[:lsb][:release].to_f < 18.04
+

 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "HP"
     default[:apt][:sources] |= ["management-component-pack"]
 
     case node[:dmi][:system][:product_name]
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
   when "HP"
     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
 
       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"
   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]
 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")
 end
 
 if node[:kernel][:modules].include?("ipmi_si")