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

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index b558f9d8e3cc7792e7e077f05ece3a5770d694c6..f270740826bb04025a5375fd62763c039f230154 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,20 +1,27 @@
-default[:hardware][:modules] = %w(loop lp rtc)
-default[:hardware][:grub][:cmdline] = %w(nomodeset)
+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] = {}
 
 default[:hardware][:sensors] = {}
 

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

 if node[:dmi] && node[:dmi][:system]
 if node[:dmi] && node[:dmi][:system]

-  case dmi.system.manufacturer
+  case node[:dmi][:system][:manufacturer]

   when "HP"
     default[:apt][:sources] |= ["management-component-pack"]
 
   when "HP"
     default[:apt][:sources] |= ["management-component-pack"]
 

-    case dmi.system.product_name
+    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
 
     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
+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"


@@ -23,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 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")