Touch XML files to reflect date of original RRD file. Don't run dump in parallel...

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 35e31ea2e2fc3d644e78dcba19f7c1434aaf714b..9dd3c0a6a7e18f197dbb83b57f347be5f7f92e76 100644 (file)
--- 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"
 
 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]
 end
 
 if node[:dmi] && node[:dmi][:system]


@@ -59,7 +57,20 @@ end
 case manufacturer
 when "HP"
   package "hponcfg"
 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"
   units << "1"
 when "TYAN"
   units << "0"


@@ -67,7 +78,7 @@ when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"
   case product
   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"
     units << "1"
   else
     units << "0"


@@ -78,19 +89,10 @@ end
 
 # Remove legacy HP G4 support which breaks modern hp-health 10.4
 if manufacturer == "HP"
 
 # 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
   end
 
   directory "/opt/hp/hp-legacy" do


@@ -180,9 +182,7 @@ service "haveged" do
   action [:enable, :start]
 end
 
   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"
 
 if node[:lsb][:release].to_f >= 12.10
   package "irqbalance"


@@ -201,6 +201,13 @@ if node[:lsb][:release].to_f >= 12.10
   end
 end
 
   end
 end
 

+# Link Layer Discovery Protocol Daemon
+package "lldpd"
+service "lldpd" do
+  action [:start, :enable]
+  supports :status => true, :restart => true, :reload => true
+end
+

 tools_packages = []
 status_packages = {}
 
 tools_packages = []
 status_packages = {}