Use the planet user consistently for generating planet data

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 81416582ddab885ae27ca6b9a64015880115fd9f..78ec107c7a08ea5c290d655cf504802838de2f19 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,25 +1,27 @@
-default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
-                                 %w(lp)
-                               else
-                                 %w(loop lp rtc)
-                               end
-
-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][:sensors] = {}

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

 
 if node[:dmi] && node[:dmi][:system]
 
 if node[:dmi] && node[:dmi][:system]

-  case dmi.system.manufacturer
+  case node[:dmi][:system][:manufacturer]

   when "HP"
   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
       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
 
   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"
   default[:hardware][:modules] |= ["microcode"]
 
   if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"


@@ -27,16 +29,12 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
   end
 end
 
   end
 end
 

-if node[:kernel] && node[:kernel][:modules]
-  raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid)
-
-  unless raidmods.empty?
-    default[:apt][:sources] |= ["hwraid"]
-  end
-end
-

 if node[:kernel][:modules].include?("ipmi_si")
   default[:hardware][:modules] |= ["ipmi_devintf"]
 if node[:kernel][:modules].include?("ipmi_si")
   default[:hardware][:modules] |= ["ipmi_devintf"]

+
+  if node[:kernel][:modules].include?("acpi_power_meter")
+    default[:hardware][:modules] |= ["acpi_ipmi"]
+  end

 end
 
 if File.exist?("/proc/xen")
 end
 
 if File.exist?("/proc/xen")


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