Switch bytemark servers to use katla for readonly queries

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

diff --git a/cookbooks/hardware/attributes/default.rb b/cookbooks/hardware/attributes/default.rb
index 26f126abd6124d88cb1a2637ba6842d964eb06f1..ce7aae86382f9ca162ff6f79381422dad01bbe37 100644 (file)
--- a/cookbooks/hardware/attributes/default.rb
+++ b/cookbooks/hardware/attributes/default.rb
@@ -1,14 +1,18 @@
-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][:grub][:kernel] = :latest
 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"]
 
-    case dmi.system.product_name
+    case node[:dmi][:system][:product_name]
     when "ProLiant DL360 G6", "ProLiant DL360 G7"
       default[:hardware][:sensors][:"power_meter-*"][:power][:power1] = { :ignore => true }
     end
@@ -26,9 +30,7 @@ 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
+  default[:apt][:sources] |= ["hwraid"] unless raidmods.empty?
 end
 
 if node[:kernel][:modules].include?("ipmi_si")