X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..9302cec0aab75609f536109ac0c10f3a44a204ef:/cookbooks/hardware/attributes/default.rb diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb index bbe44348e..218e6228e 100644 --- a/cookbooks/hardware/attributes/default.rb +++ b/cookbooks/hardware/attributes/default.rb @@ -1,18 +1,23 @@ 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 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 } 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 @@ -24,20 +29,12 @@ 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"] -end -if File.exist?("/proc/xen") - default[:hardware][:watchdog] = "xen_wdt" -elsif node[:kernel][:modules].include?("i6300esb") - default[:hardware][:watchdog] = "none" + if node[:kernel][:modules].include?("acpi_power_meter") + default[:hardware][:modules] |= ["acpi_ipmi"] + end end if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor") && @@ -45,4 +42,15 @@ if File.exist?("/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor") && 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 + +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