nominatim: temporarily disable cleanup of WAL archive

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index c0a805b26600a3fdd6533c6dd065c4f1be98533a..f80e6a528d6bf2476d45dea3331733da95a1a8dc 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,4 +1,5 @@
 default[:hardware][:modules] = %w(loop lp rtc)
+default[:hardware][:grub][:cmdline] = %w(nomodeset)
 default[:hardware][:sensors] = {}
 
 if node[:dmi] && node[:dmi][:system]
@@ -8,7 +9,7 @@ if node[:dmi] && node[:dmi][:system]
 
     case dmi.system.product_name
     when "ProLiant DL360 G6", "ProLiant DL360 G7"
-      default[:hardware][:sensors]["power_meter-*"][:power]["power1"] = { :ignore => true }
+      default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
   end
 end
@@ -16,13 +17,13 @@ end
 if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
   default[:hardware][:modules] |= ["microcode"]
 
-  if node[:cpu]["0"][:vendor_id] == "GenuineIntel"
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
     default[:hardware][:modules] |= ["coretemp"]
   end
 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"]