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 fb19506f4be941901385794c0a9133645ff738c5..2527e16224a13c5e5b720a1079145313f0518d39 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -7,7 +7,7 @@ default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
 default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
 
-default[:hardware][:mcelog][:enabled] = true
+default[:hardware][:mcelog][:enabled] = node[:lsb][:release].to_f < 18.04
 
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
@@ -15,7 +15,7 @@ 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