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

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 2a4e8e2724eef198c7d9b45df0c651b372ea72ae..c9d003e5745b2ce1a4a698ae4c48a2f96914aa10 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,40 +1,61 @@
-default[:hardware][:modules] = [ "loop", "lp", "rtc" ]
+default[:hardware][:modules] = %w[lp]
+default[:hardware][:blacklisted_modules] = %w[]
+default[:hardware][:grub][:cmdline] = %w[nomodeset]

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

+default[:hardware][:hwmon] = {}
+default[:hardware][:ipmi][:excluded_sensors] = []
+default[:hardware][:ipmi][:custom_args] = []

 
 

-if node[:dmi] and node[:dmi][:system]
-  case dmi.system.manufacturer
+if node[:dmi] && node[:dmi][:system]
+  case node[:dmi][:system][:manufacturer]

   when "HP"
   when "HP"

-    default[:apt][:sources] |= [ "management-component-pack" ]
+    case node[:dmi][:system][:product_name]
+    when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2"
+      default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
+    end

 
 

-    case dmi.system.product_name
-      when "ProLiant DL360 G6", "ProLiant DL360 G7"
-        default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }
+    case node[:dmi][:system][:product_name]
+    when "ProLiant DL360 G6", "ProLiant DL360 G7", "ProLiant SE326M1R2", "ProLiant DL360e Gen8", "ProLiant DL360p Gen8"
+      default[:hardware][:ipmi][:custom_args] |= ["--workaround-flags=discretereading"]

     end
   end
 end
 
     end
   end
 end
 

-if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
-  default[:hardware][:modules] |= [ "microcode" ]
+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] |= [ "coretemp" ]
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= ["coretemp"]

   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 node[:kernel][:modules].include?("ipmi_si")
+  default[:hardware][:modules] |= ["ipmi_devintf"]

 
 

-  unless raidmods.empty?
-    default[:apt][:sources] |= [ "hwraid" ]
+  if node[:kernel][:modules].include?("acpi_power_meter")
+    default[:hardware][:modules] |= ["acpi_ipmi"]

   end
 end
 
   end
 end
 

-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"
 end
 if File.exist?("/proc/xen")
   default[:hardware][:watchdog] = "xen_wdt"
 elsif node[:kernel][:modules].include?("i6300esb")
   default[:hardware][:watchdog] = "none"
 end

+
+if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor") &&
+   File.read("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor").chomp == "ondemand"
+  default[:sysfs][:cpufreq_ondemand][:comment] = "Tune the ondemand CPU frequency governor"
+  default[:sysfs][:cpufreq_ondemand][:parameters][:"devices/system/cpu/cpufreq/ondemand/up_threshold"] = "25"
+  default[:sysfs][:cpufreq_ondemand][:parameters][:"devices/system/cpu/cpufreq/ondemand/sampling_down_factor"] = "100"
+end
+
+energy_perf_bias = Dir.glob("/sys/devices/system/cpu/cpu*/power/energy_perf_bias")
+
+unless energy_perf_bias.empty?
+  default[:sysfs][:cpu_power_energy_perf_bias][:comment] = "Set CPU Energy-Performance Bias Preference to performance"
+
+  energy_perf_bias.sort.each do |path|
+    default[:sysfs][:cpu_power_energy_perf_bias][:parameters][path.sub(%r{^/sys/}, "")] = "0"
+  end
+end