X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/46230812e0c9de44789e26349ad8686bd27cff36..0a24539ef82e55b09c6801a1c80e9f4c952f6a2f:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 35e31ea2e..7d326d68b 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -59,7 +59,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"
@@ -78,19 +91,10 @@ end
 
 # Remove legacy HP G4 support which breaks modern hp-health 10.4
 if manufacturer == "HP"
-  file "/opt/hp/hp-health/bin/hpasmd" do
-    action :delete
-  end
-  file "/usr/lib/libhpasmintrfc.so.3.0" do
-    action :delete
-  end
-
-  file "/usr/lib/libhpasmintrfc.so.3" do
-    action :delete
-  end
-
-  file "/usr/lib/libhpasmintrfc.so" do
-    action :delete
+  %w(/opt/hp/hp-health/bin/hpasmd /usr/lib/libhpasmintrfc.so.3.0 %/usr/lib/libhpasmintrfc.so.3 /usr/lib/libhpasmintrfc.so).each do |filename|
+    file filename do
+      action :delete
+    end
   end
 
   directory "/opt/hp/hp-legacy" do