X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/299e629f1385efd4c45dc1f351cc4dfa935c7382..9b7e8a0e7ae0d274c4e1fc54d04cdd5cbef38664:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index f9f76cd46..c7834a6e2 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]
@@ -52,8 +49,6 @@ units = []
 
 if node[:roles].include?("bytemark") || node[:roles].include?("exonetric")
   units << "0"
-elsif node[:roles].include?("ovh")
-  units << "2"
 end
 
 case manufacturer
@@ -80,7 +75,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"
@@ -91,7 +86,7 @@ end
 
 # Remove legacy HP G4 support which breaks modern hp-health 10.4
 if manufacturer == "HP"
-  %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|
+  %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
@@ -186,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 = []
@@ -216,7 +216,7 @@ node[:kernel][:modules].each_key do |modname|
     status_packages["cciss-vol-status"] ||= []
   when "mptsas"
     tools_packages << "lsiutil"
-    # status_packages["mpt-status"] ||= []
+    status_packages["mpt-status"] ||= []
   when "mpt2sas", "mpt3sas"
     tools_packages << "sas2ircu"
     status_packages["sas2ircu-status"] ||= []
@@ -246,7 +246,7 @@ node[:block_device].each do |name, attributes|
   end
 end
 
-%w(hpssacli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package|
+%w[hpssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
   else
@@ -318,30 +318,22 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
-  package "alien"
 
-  remote_file "#{Chef::Config[:file_cache_path]}/DataCenterTool_3_0_0_Linux.zip" do
-    source "https://downloadmirror.intel.com/23931/eng/DataCenterTool_3_0_0_Linux.zip"
+  remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.7_Linux.zip" do
+    source "https://downloadmirror.intel.com/27144/eng/Intel_SSD_Data_Center_Tool_3.0.7_Linux.zip"
   end
 
-  execute "unzip-DataCenterTool" do
-    command "unzip DataCenterTool_3_0_0_Linux.zip isdct-3.0.0.400-15.x86_64.rpm"
+  execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.7_Linux.zip" do
+    command "unzip Intel_SSD_Data_Center_Tool_3.0.7_Linux.zip isdct_3.0.7.401-17_amd64.deb"
     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"
-    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct-3.0.0.400-15.x86_64.rpm") }
-  end
-
-  execute "alien-isdct" do
-    command "alien --to-deb isdct-3.0.0.400-15.x86_64.rpm"
-    cwd Chef::Config[:file_cache_path]
-    user "root"
-    group "root"
-    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_3.0.0.400-16_amd64.deb") }
+    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_3.0.7.401-17_amd64.deb") }
   end
 
   dpkg_package "isdct" do
-    source "#{Chef::Config[:file_cache_path]}/isdct_3.0.0.400-16_amd64.deb"
+    version "3.0.7.401"
+    source "#{Chef::Config[:file_cache_path]}/isdct_3.0.7.401-17_amd64.deb"
   end
 end
 
@@ -384,7 +376,7 @@ smartd_service = if node[:lsb][:release].to_f >= 16.04
 
 disks = disks.compact
 
-if disks.count > 0
+if disks.count.positive?
   package "smartmontools"
 
   template "/usr/local/bin/smartd-mailer" do
@@ -434,7 +426,7 @@ else
   end
 end
 
-if disks.count > 0
+if disks.count.positive?
   munin_plugin "hddtemp_smartctl" do
     conf "munin.hddtemp.erb"
     conf_variables :disks => disks
@@ -482,22 +474,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]