Manage httpd.conf correctly for apache 2.4

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 24dc2505d2f845f4e7eb375b663ca2091a3e7ebc..46b5893a8746398535b02ab02c4cc7184465e59e 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,24 +1,40 @@
+default[:hardware][:modules] = [ "loop", "lp", "rtc" ]
+default[:hardware][:sensors] = {}
+

 if node[:dmi] and node[:dmi][:system]
   case dmi.system.manufacturer
   when "HP"
 if node[:dmi] and node[:dmi][:system]
   case dmi.system.manufacturer
   when "HP"

-    if node[:lsb][:release].to_f <= 11.10
-      default[:apt][:sources] |= [ "proliant-support-pack" ]
-    else
-      default[:apt][:sources] |= [ "management-component-pack" ]
+    default[:apt][:sources] |= [ "management-component-pack" ]
+
+    case dmi.system.product_name
+      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]
-  if node[:kernel][:modules].include?("mpt2sas")
-    default[:apt][:sources] |= [ "hwraid" ]
-  end
+if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
+  default[:hardware][:modules] |= [ "microcode" ]

 
 

-  if node[:kernel][:modules].include?("megaraid_sas")
-    default[:apt][:sources] |= [ "hwraid" ]
+  if node[:cpu]["0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= [ "coretemp" ]

   end
   end

+end

 
 

-  if node[:kernel][:modules].include?("aacraid")
+if node[:kernel] and node[:kernel][:modules]
+  raidmods = node[:kernel][:modules].keys & ["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"]
+
+  unless raidmods.empty?

     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