Revert "Take thorn-03 out of production"

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 8b794cab78df5e2e6396374215f90d7fdbce08bb..54c8956a3b502c600714ffa9eb6ef5d1f3886079 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,26 +1,39 @@
+default[:hardware][:modules] = %w(loop lp rtc)

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

-if node[:dmi] and node[:dmi][:system]
+if node[:dmi] && node[:dmi][:system]

   case dmi.system.manufacturer
   when "HP"
   case dmi.system.manufacturer
   when "HP"

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

 
     case dmi.system.product_name
 
     case dmi.system.product_name

-      when "ProLiant DL360 G6", "ProLiant DL360 G7"
-        default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }
+    when "ProLiant DL360 G6", "ProLiant DL360 G7"
+      default[:hardware][:sensors][:"power_meter-*"][:power][:"power1"] = { :ignore => true }

     end
   end
 end
 
     end
   end
 end
 

-if node[:kernel] and node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
+  default[:hardware][:modules] |= ["microcode"]
+
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= ["coretemp"]
+  end
+end
+
+if node[:kernel] && node[:kernel][:modules]
+  raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas megaraid_mm megaraid_sas aacraid)

 
   unless raidmods.empty?
 
   unless raidmods.empty?

-    default[:apt][:sources] |= [ "hwraid" ]
+    default[:apt][:sources] |= ["hwraid"]

   end
 end
 
   end
 end
 

-if File.exists?("/proc/xen")
+if node[:kernel][:modules].include?("ipmi_si")
+  default[:hardware][:modules] |= ["ipmi_devintf"]
+end
+
+if File.exist?("/proc/xen")

   default[:hardware][:watchdog] = "xen_wdt"
 elsif node[:kernel][:modules].include?("i6300esb")
   default[:hardware][:watchdog] = "none"
   default[:hardware][:watchdog] = "xen_wdt"
 elsif node[:kernel][:modules].include?("i6300esb")
   default[:hardware][:watchdog] = "none"