X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/777280b61f312d00aa7c5c4cf2b3b81d85e66469..26cf6103779739532340c4838555985479e76de6:/cookbooks/hardware/recipes/default.rb?ds=sidebyside diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index cc46376f4..739901cf0 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -8,7 +8,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -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] @@ -58,11 +55,8 @@ case manufacturer when "HP" package "hponcfg" - # Downgrade hp-health to 10.0.0.1.3-4. as 10.40-1815.49 has issues with reliable startup package "hp-health" do action :install - version "10.0.0.1.3-4." - options "--force-yes" notifies :restart, "service[hp-health]" end @@ -71,6 +65,18 @@ when "HP" supports :status => true, :restart => true end + if product.end_with?("Gen8", "Gen9") + package "hp-ams" do + action :install + notifies :restart, "service[hp-ams]" + end + + service "hp-ams" do + action [:enable, :start] + supports :status => true, :restart => true + end + end + units << "1" when "TYAN" units << "0" @@ -78,7 +84,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+", "Super Server" + when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-1028U-TN10RT+", "SYS-2028U-TN24R4T+", "Super Server" units << "1" else units << "0" @@ -87,44 +93,9 @@ 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 - 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 - 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 @@ -184,21 +155,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 = [] @@ -207,14 +183,14 @@ status_packages = {} node[:kernel][:modules].each_key do |modname| case modname when "cciss" - tools_packages << "hpssacli" + tools_packages << "ssacli" status_packages["cciss-vol-status"] ||= [] when "hpsa" - tools_packages << "hpssacli" + tools_packages << "ssacli" 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"] ||= [] @@ -244,7 +220,7 @@ node[:block_device].each do |name, attributes| end end -%w(hpssacli lsiutil sas2ircu megactl megacli arcconf).each do |tools_package| +%w[ssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package| if tools_packages.include?(tools_package) package tools_package else @@ -259,7 +235,7 @@ if tools_packages.include?("areca") git "/opt/areca" do action :sync - repository "git://chef.openstreetmap.org/areca.git" + repository "https://git.openstreetmap.org/private/areca.git" user "root" group "root" end @@ -316,48 +292,43 @@ 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.13_Linux.zip" do + source "https://downloadmirror.intel.com/28460/eng/Intel_SSD_Data_Center_Tool_3.0.17_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.13_Linux.zip" do + command "unzip Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip isdct_3.0.13.400-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.13.400-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.13.400-17" + source "#{Chef::Config[:file_cache_path]}/isdct_3.0.13.400-17_amd64.deb" end 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]] - device = controller[:device].sub("/dev/", "") - smart = disk[:smart_device] - - if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/ - array = node[:hardware][:disk][:arrays][disk[:arrays].first] - munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}" - elsif smart =~ /^.*,(\d+)$/ - munin = "#{device}-#{Regexp.last_match(1)}" - elsif smart =~ %r{^.*,(\d+)/(\d+)$} - munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}" + + if controller && controller[:device] + device = controller[:device].sub("/dev/", "") + smart = disk[:smart_device] + + if device.start_with?("cciss/") && smart =~ /^cciss,(\d+)$/ + array = node[:hardware][:disk][:arrays][disk[:arrays].first] + munin = "cciss-3#{array[:wwn]}-#{Regexp.last_match(1)}" + elsif smart =~ /^.*,(\d+)$/ + munin = "#{device}-#{Regexp.last_match(1)}" + elsif smart =~ %r{^.*,(\d+)/(\d+)$} + munin = "#{device}-#{Regexp.last_match(1)}:#{Regexp.last_match(2)}" + end end elsif disk[:device] device = disk[:device].sub("/dev/", "") @@ -374,15 +345,9 @@ 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 > 0 +if disks.count.positive? package "smartmontools" template "/usr/local/bin/smartd-mailer" do @@ -407,7 +372,7 @@ if disks.count > 0 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]" @@ -417,7 +382,7 @@ if disks.count > 0 # an Areca controller as they only allow one thing to # talk to the controller at a time and smartd will # throw errors if it clashes with munin - disks = disks.reject { |disk| disk[:smart] && disk[:smart].start_with?("areca,") } + disks = disks.reject { |disk| disk[:smart]&.start_with?("areca,") } disks.each do |disk| munin_plugin "smart_#{disk[:munin]}" do @@ -427,12 +392,12 @@ if disks.count > 0 end end else - service smartd_service do + service "smartd" do action [:stop, :disable] end end -if disks.count > 0 +if disks.count.positive? munin_plugin "hddtemp_smartctl" do conf "munin.hddtemp.erb" conf_variables :disks => disks @@ -450,6 +415,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 @@ -480,22 +446,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]