switch2osm: add expiry matching github pages

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 54c8956a3b502c600714ffa9eb6ef5d1f3886079..2619fd5497745302b051851d7e3d02ffa7fd6266 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,19 +1,20 @@
-default[:hardware][:modules] = %w(loop lp rtc)
+default[:hardware][:modules] = %w[lp]
+default[:hardware][:grub][:cmdline] = %w[nomodeset]

 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]
 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]

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

   when "HP"
     default[:apt][:sources] |= ["management-component-pack"]
 
   when "HP"
     default[:apt][:sources] |= ["management-component-pack"]
 

-    case dmi.system.product_name
-    when "ProLiant DL360 G6", "ProLiant DL360 G7"
-      default[:hardware][:sensors][:"power_meter-*"][:power][:"power1"] = { :ignore => true }
+    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
   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"


@@ -22,11 +23,9 @@ if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
 end
 
 if node[:kernel] && node[:kernel][:modules]
 end
 
 if node[:kernel] && node[:kernel][:modules]

-  raidmods = node[:kernel][:modules].keys & %w(cciss hpsa mptsas mpt2sas megaraid_mm megaraid_sas aacraid)
+  raidmods = node[:kernel][:modules].keys & %w[cciss hpsa mptsas mpt2sas mpt3sas megaraid_mm megaraid_sas aacraid]

 
 

-  unless raidmods.empty?
-    default[:apt][:sources] |= ["hwraid"]
-  end
+  default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?

 end
 
 if node[:kernel][:modules].include?("ipmi_si")
 end
 
 if node[:kernel][:modules].include?("ipmi_si")


@@ -38,3 +37,10 @@ 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"
+end