dmca: fix apache config

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 2527e16224a13c5e5b720a1079145313f0518d39..d86e0347e999a4ff2a2cbd6b996c27d545d1ff90 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,13 +1,10 @@
-default[:hardware][:modules] = if node[:lsb][:release].to_f >= 16.04
-                                 %w[lp]
-                               else
-                                 %w[loop lp rtc]
-                               end
-
+default[:hardware][:modules] = %w[lp]
+default[:hardware][:blacklisted_modules] = %w[]
 default[:hardware][:grub][:cmdline] = %w[nomodeset]
 default[:hardware][:sensors] = {}
-
-default[:hardware][:mcelog][:enabled] = node[:lsb][:release].to_f < 18.04
+default[:hardware][:hwmon] = {}
+default[:hardware][:ipmi][:excluded_sensors] = []
+default[:hardware][:ipmi][:custom_args] = []
 
 if node[:dmi] && node[:dmi][:system]
   case node[:dmi][:system][:manufacturer]
@@ -18,6 +15,11 @@ if node[:dmi] && node[:dmi][:system]
     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
 
@@ -37,6 +39,10 @@ end
 
 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")
@@ -44,3 +50,10 @@ if File.exist?("/proc/xen")
 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