X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/31b755737cdcb73772779be590e9a24241808adc..11fdc9157c3243a489cd1c5f05b1abd686952555:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 13c1739b5..9dd3c0a6a 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]
@@ -64,13 +62,13 @@ when "HP"
   package "hp-health" do
     action :install
     version "10.0.0.1.3-4."
-    options "--allow-downgrades"
+    options "--force-yes"
     notifies :restart, "service[hp-health]"
   end
 
   service "hp-health" do
     action [:enable, :start]
-    supports :status => true, :restart => true, :reload => true
+    supports :status => true, :restart => true
   end
 
   units << "1"
@@ -80,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"
@@ -184,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"
@@ -205,6 +201,13 @@ if node[:lsb][:release].to_f >= 12.10
   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 = {}