X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da9169fec897102250b6b59f4ead2402ea6b6eec..9a6fabc89f05283c96e6eaff97935cc10e788c62:/cookbooks/hardware/attributes/default.rb diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index ff33c73b5..218e6228e 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -9,8 +9,6 @@ default[:hardware][:ipmi][:custom_args] = [] if node[:dmi] && node[:dmi][:system] case node[:dmi][:system][:manufacturer] 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 } @@ -31,12 +29,6 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]).negative? end end -if node[:kernel] && node[:kernel][:modules] - raidmods = node[:kernel][:modules].keys & %w[cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid] - - default[:apt][:sources] |= ["hwraid"] unless raidmods.empty? -end - if node[:kernel][:modules].include?("ipmi_si") default[:hardware][:modules] |= ["ipmi_devintf"] @@ -45,20 +37,20 @@ if node[:kernel][:modules].include?("ipmi_si") end 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" + default[:sysfs][:cpufreq_ondemand][:parameters][:"devices/system/cpu/cpufreq/ondemand/ignore_nice_load"] = "1" end -if File.exist?("/sys/devices/system/cpu/cpu0/power/energy_perf_bias") - default[:sysfs][:cpu_power_energy_perf_bias][:comment] = "Set CPU Energy-Performance Bias Preference to performance" - default[:sysfs][:cpu_power_energy_perf_bias][:parameters][:"devices/system/cpu/cpu*/power/energy_perf_bias"] = "0" +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