Allow % in local parts for locally submitted mail

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 473ceb1811249ac6922131b19aeab390ddd18ca0..46b5893a8746398535b02ab02c4cc7184465e59e 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,3 +1,4 @@
+default[:hardware][:modules] = [ "loop", "lp", "rtc" ]

 default[:hardware][:sensors] = {}
 
 if node[:dmi] and node[:dmi][:system]
 default[:hardware][:sensors] = {}
 
 if node[:dmi] and node[:dmi][:system]


@@ -7,11 +8,19 @@ if node[:dmi] and node[:dmi][:system]
 
     case dmi.system.product_name
       when "ProLiant DL360 G6", "ProLiant DL360 G7"
 
     case dmi.system.product_name
       when "ProLiant DL360 G6", "ProLiant DL360 G7"

-        default[:hardware][:sensors][:power][:power1] = { :ignore => true }
+        default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }

     end
   end
 end
 
     end
   end
 end
 

+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] and node[:kernel][:modules]
   raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 
 if node[:kernel] and node[:kernel][:modules]
   raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
 


@@ -19,3 +28,13 @@ if node[:kernel] and node[:kernel][:modules]
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end
     default[:apt][:sources] |= [ "hwraid" ]
   end
 end

+
+if node[:kernel][:modules].include?("ipmi_si")
+  default[:hardware][:modules] |= [ "ipmi_devintf" ]
+end
+
+if File.exists?("/proc/xen")
+  default[:hardware][:watchdog] = "xen_wdt"
+elsif node[:kernel][:modules].include?("i6300esb")
+  default[:hardware][:watchdog] = "none"
+end