X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/388687b7120815bc61f49de6c5dd0ea793dad67b..b5b025beaf095afbe4b53005c6f308e44c4af3eb:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index f2af6c986..b74d4235a 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -94,29 +94,8 @@ when "IBM"
 end
 
 units.sort.uniq.each do |unit|
-  if node[:lsb][:release].to_f >= 16.04
-    service "serial-getty@ttyS#{unit}" do
-      action [:enable, :start]
-    end
-  else
-    file "/etc/init/ttySttyS#{unit}.conf" do
-      action :delete
-    end
-
-    template "/etc/init/ttyS#{unit}.conf" do
-      source "tty.conf.erb"
-      owner "root"
-      group "root"
-      mode 0o644
-      variables :unit => unit
-    end
-
-    service "ttyS#{unit}" do
-      provider Chef::Provider::Service::Upstart
-      action [:enable, :start]
-      supports :status => true, :restart => true, :reload => false
-      subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"
-    end
+  service "serial-getty@ttyS#{unit}" do
+    action [:enable, :start]
   end
 end
 
@@ -130,6 +109,7 @@ if node[:hardware][:grub][:kernel]
   package "linux-image-#{kernel_version}-generic"
   package "linux-image-extra-#{kernel_version}-generic"
   package "linux-headers-#{kernel_version}-generic"
+  package "linux-tools-#{kernel_version}-generic"
 
   boot_device = IO.popen(["df", "/boot"]).readlines.last.split.first
   boot_uuid = IO.popen(["blkid", "-o", "value", "-s", "UUID", boot_device]).readlines.first.chomp
@@ -198,24 +178,6 @@ service "lldpd" do
   supports :status => true, :restart => true, :reload => true
 end
 
-if node[:hardware][:mcelog][:enabled]
-  package "mcelog"
-
-  %w[bus cache dimm iomca page socket-memory unknown].each do |trigger|
-    template "/etc/mcelog/#{trigger}-error-trigger.local" do
-      source "mcelog-trigger.erb"
-      owner "root"
-      group "root"
-      mode 0o755
-    end
-  end
-
-  service "mcelog" do
-    action [:start, :enable]
-    supports :status => true, :restart => true, :reload => false
-  end
-end
-
 tools_packages = []
 status_packages = {}
 
@@ -333,7 +295,7 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
   remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
-    source "https://downloadmirror.intel.com/27863/eng/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip"
+    source "https://downloadmirror.intel.com/28460/eng/Intel_SSD_Data_Center_Tool_3.0.17_Linux.zip"
   end
 
   execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
@@ -351,7 +313,7 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
 end
 
 disks = disks.map do |disk|
-  next if disk[:state] == "spun_down"
+  next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])
 
   if disk[:smart_device]
     controller = node[:hardware][:disk][:controllers][disk[:controller]]
@@ -384,12 +346,6 @@ disks = disks.map do |disk|
   ]
 end
 
-smartd_service = if node[:lsb][:release].to_f >= 16.04
-                   "smartd"
-                 else
-                   "smartmontools"
-                 end
-
 disks = disks.compact
 
 if disks.count.positive?
@@ -417,7 +373,7 @@ if disks.count.positive?
     mode 0o644
   end
 
-  service smartd_service do
+  service "smartd" do
     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"
@@ -437,7 +393,7 @@ if disks.count.positive?
     end
   end
 else
-  service smartd_service do
+  service "smartd" do
     action [:stop, :disable]
   end
 end
@@ -460,6 +416,7 @@ plugins = Dir.glob("/etc/munin/plugins/smart_*").map { |p| File.basename(p) } -
 plugins.each do |plugin|
   munin_plugin plugin do
     action :delete
+    conf "munin.smart.erb"
   end
 end