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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index cc46376f4..d996bab48 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -27,11 +27,8 @@ end
 case node[:cpu][:"0"][:vendor_id]
 when "GenuineIntel"
   package "intel-microcode"
-end
-
-case node[:cpu][:"0"][:vendor_id]
 when "AuthenticAMD"
-  package "amd64-microcode" if node[:lsb][:release].to_f >= 14.04
+  package "amd64-microcode"
 end
 
 if node[:dmi] && node[:dmi][:system]
@@ -184,21 +181,26 @@ end
 
 package "ipmitool" if node[:kernel][:modules].include?("ipmi_si")
 
-if node[:lsb][:release].to_f >= 12.10
-  package "irqbalance"
+package "irqbalance"
 
-  template "/etc/default/irqbalance" do
-    source "irqbalance.erb"
-    owner "root"
-    group "root"
-    mode 0o644
-  end
+template "/etc/default/irqbalance" do
+  source "irqbalance.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+end
 
-  service "irqbalance" do
-    action [:start, :enable]
-    supports :status => false, :restart => true, :reload => false
-    subscribes :restart, "template[/etc/default/irqbalance]"
-  end
+service "irqbalance" do
+  action [:start, :enable]
+  supports :status => false, :restart => true, :reload => false
+  subscribes :restart, "template[/etc/default/irqbalance]"
+end
+
+# Link Layer Discovery Protocol Daemon
+package "lldpd"
+service "lldpd" do
+  action [:start, :enable]
+  supports :status => true, :restart => true, :reload => true
 end
 
 tools_packages = []
@@ -480,22 +482,9 @@ template "/etc/modules" do
   mode 0o644
 end
 
-if node[:lsb][:release].to_f <= 12.10
-  service "module-init-tools" do
-    provider Chef::Provider::Service::Upstart
-    action :nothing
-    subscribes :start, "template[/etc/modules]"
-  end
-else
-  service "kmod" do
-    if node[:lsb][:release].to_f >= 15.10
-      provider Chef::Provider::Service::Systemd
-    else
-      provider Chef::Provider::Service::Upstart
-    end
-    action :nothing
-    subscribes :start, "template[/etc/modules]"
-  end
+service "kmod" do
+  action :nothing
+  subscribes :start, "template[/etc/modules]"
 end
 
 if node[:hardware][:watchdog]