X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/960840f010c3205e890cdbda927801bb313a4764..9d133ea818fd0c49da38bdb756e139060aee5390:/cookbooks/hardware/recipes/default.rb diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 936ffb01b..04425a9b0 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -65,7 +65,7 @@ when "HP" supports :status => true, :restart => true end - if product.end_with?("Gen8") + if product.end_with?("Gen8", "Gen9") package "hp-ams" do action :install notifies :restart, "service[hp-ams]" @@ -93,21 +93,6 @@ when "IBM" units << "0" 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| - file filename do - action :delete - manage_symlink_source false - end - end - - directory "/opt/hp/hp-legacy" do - action :delete - recursive true - end -end - units.sort.uniq.each do |unit| if node[:lsb][:release].to_f >= 16.04 service "serial-getty@ttyS#{unit}" do @@ -348,7 +333,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 @@ -366,7 +351,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]] @@ -475,6 +460,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