Fix use of deprecated features

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 98c6f91862db4007b1586f15078f5b707abffee1..f77967a208604013e7ca5f50858f6a744748a23a 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,36 +1,42 @@
-default[:hardware][:modules] = %w(loop lp rtc)
+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][: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"
   when "HP"

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

 
 

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

     when "ProLiant DL360 G6", "ProLiant DL360 G7"
     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
 
 if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0
     end
   end
 end
 
 if Chef::Util.compare_versions(node[:kernel][:release], [3, 3]) < 0

-  default[:hardware][:modules] |= [ "microcode" ]
+  default[:hardware][:modules] |= ["microcode"]

 
 

-  if node[:cpu]["0"][:vendor_id] == "GenuineIntel"
-    default[:hardware][:modules] |= [ "coretemp" ]
+  if node[:cpu][:"0"][:vendor_id] == "GenuineIntel"
+    default[:hardware][:modules] |= ["coretemp"]

   end
 end
 
 if node[:kernel] && node[:kernel][:modules]
   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?
 
   unless raidmods.empty?

-    default[:apt][:sources] |= [ "hwraid" ]
+    default[:apt][:sources] |= ["hwraid"]

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

-  default[:hardware][:modules] |= [ "ipmi_devintf" ]
+  default[:hardware][:modules] |= ["ipmi_devintf"]

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