X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6fac9148d15864c1f4e09d9adfbb9db3b01181fa..a1b52618178ed082ce2b73766c248a91cfe1fb31:/cookbooks/hardware/attributes/default.rb?ds=inline diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index f80e6a528..218e6228e 100644 --- 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] = %w[lp] +default[:hardware][:blacklisted_modules] = %w[] +default[:hardware][:grub][:cmdline] = %w[nomodeset] default[:hardware][:sensors] = {} +default[:hardware][:hwmon] = {} +default[:hardware][:ipmi][:excluded_sensors] = [] +default[:hardware][:ipmi][:custom_args] = [] if node[:dmi] && node[:dmi][:system] - case dmi.system.manufacturer + case node[:dmi][:system][:manufacturer] when "HP" - default[:apt][:sources] |= ["management-component-pack"] - - case dmi.system.product_name - when "ProLiant DL360 G6", "ProLiant DL360 G7" + 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 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 -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" @@ -22,20 +29,28 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0 end end -if node[:kernel] && node[:kernel][:modules] - raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas mpt3sas 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 -if node[:kernel][:modules].include?("ipmi_si") - default[:hardware][:modules] |= ["ipmi_devintf"] +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" + default[:sysfs][:cpufreq_ondemand][:parameters][:"devices/system/cpu/cpufreq/ondemand/ignore_nice_load"] = "1" end -if File.exist?("/proc/xen") - default[:hardware][:watchdog] = "xen_wdt" -elsif node[:kernel][:modules].include?("i6300esb") - default[:hardware][:watchdog] = "none" +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 balance-performance" + + energy_perf_bias.sort.each do |path| + default[:sysfs][:cpu_power_energy_perf_bias][:parameters][path.sub(%r{^/sys/}, "")] = "4" + end end