X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/01efcdfb1287aa647751c28e33101323c065ae3d..777280b61f312d00aa7c5c4cf2b3b81d85e66469:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 1308f44fc..cc46376f4 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -31,9 +31,7 @@ end
 
 case node[:cpu][:"0"][:vendor_id]
 when "AuthenticAMD"
-  if node[:lsb][:release].to_f >= 14.04
-    package "amd64-microcode"
-  end
+  package "amd64-microcode" if node[:lsb][:release].to_f >= 14.04
 end
 
 if node[:dmi] && node[:dmi][:system]
@@ -59,7 +57,20 @@ end
 case manufacturer
 when "HP"
   package "hponcfg"
-  package "hp-health"
+
+  # Downgrade hp-health to 10.0.0.1.3-4. as 10.40-1815.49 has issues with reliable startup
+  package "hp-health" do
+    action :install
+    version "10.0.0.1.3-4."
+    options "--force-yes"
+    notifies :restart, "service[hp-health]"
+  end
+
+  service "hp-health" do
+    action [:enable, :start]
+    supports :status => true, :restart => true
+  end
+
   units << "1"
 when "TYAN"
   units << "0"
@@ -67,7 +78,7 @@ when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"
   case product
-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+"
+  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-2028U-TN24R4T+", "Super Server"
     units << "1"
   else
     units << "0"
@@ -171,9 +182,7 @@ service "haveged" do
   action [:enable, :start]
 end
 
-if node[:kernel][:modules].include?("ipmi_si")
-  package "ipmitool"
-end
+package "ipmitool" if node[:kernel][:modules].include?("ipmi_si")
 
 if node[:lsb][:release].to_f >= 12.10
   package "irqbalance"