X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/bedcb6252037c57d9055e7678f93a6098594c39e..036734d15e6cd4fbc57e031ceca870f6c90e53bf:/cookbooks/hardware/recipes/default.rb diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 149ed47f0..d7c508d9a 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -28,11 +28,17 @@ ohai_plugin "hardware" do template "ohai.rb.erb" end -case node[:cpu][:"0"][:vendor_id] -when "GenuineIntel" - package "intel-microcode" -when "AuthenticAMD" - package "amd64-microcode" +if platform?("debian") + package "firmware-linux" +end + +if node[:cpu] && node[:cpu][:"0"] && node[:cpu][:"0"][:vendor_id] + case node[:cpu][:"0"][:vendor_id] + when "GenuineIntel" + package "intel-microcode" + when "AuthenticAMD" + package "amd64-microcode" + end end if node[:dmi] && node[:dmi][:system] @@ -56,17 +62,35 @@ if node[:roles].include?("bytemark") || node[:roles].include?("exonetric") || no end case manufacturer -when "HP" +when "HP", "HPE" + include_recipe "apt::management-component-pack" + package "hponcfg" + execute "update-ilo" do + action :nothing + command "/usr/sbin/hponcfg -f /etc/ilo-defaults.xml" + not_if { kitchen? } + end + + template "/etc/ilo-defaults.xml" do + source "ilo-defaults.xml.erb" + owner "root" + group "root" + mode "644" + notifies :run, "execute[update-ilo]" + end + package "hp-health" do action :install notifies :restart, "service[hp-health]" + only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 } end service "hp-health" do action [:enable, :start] supports :status => true, :restart => true + only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 } end if product.end_with?("Gen8", "Gen9") @@ -79,9 +103,23 @@ when "HP" action [:enable, :start] supports :status => true, :restart => true end + elsif product.end_with?("Gen10") + package "amsd" do + action :install + notifies :restart, "service[amsd]" + end + + service "amsd" do + action [:enable, :start] + supports :status => true, :restart => true + end end - units << "1" + units << if product.end_with?("Gen10") + "0" + else + "1" + end when "TYAN" units << "0" when "TYAN Computer Corporation" @@ -115,6 +153,7 @@ end units.sort.uniq.each do |unit| service "serial-getty@ttyS#{unit}" do action [:enable, :start] + not_if { kitchen? } end end @@ -141,7 +180,7 @@ if File.exist?("/etc/default/grub") execute "update-grub" do action :nothing command "/usr/sbin/update-grub" - not_if { ENV["TEST_KITCHEN"] } + not_if { kitchen? } end template "/etc/default/grub" do @@ -154,6 +193,8 @@ if File.exist?("/etc/default/grub") end end +package "initramfs-tools" + execute "update-initramfs" do action :nothing command "update-initramfs -u -k all" @@ -169,17 +210,41 @@ template "/etc/initramfs-tools/conf.d/mdadm" do notifies :run, "execute[update-initramfs]" end -package "haveged" -service "haveged" do - action [:enable, :start] +# haveged is only required on older kernels +# /dev/random is not blocking anymore in 5.15+ +if Chef::Util.compare_versions(node[:kernel][:release], [5, 15]).negative? + package "haveged" + service "haveged" do + action [:enable, :start] + end +else + service "haveged" do + action [:stop, :disable] + end + package "haveged" do + action :remove + end end if node[:kernel][:modules].include?("ipmi_si") package "ipmitool" package "freeipmi-tools" + template "/etc/prometheus/ipmi_local.yml" do + source "ipmi_local.yml.erb" + owner "root" + group "root" + mode "644" + end + prometheus_exporter "ipmi" do port 9290 + user "root" + private_devices false + protect_clock false + system_call_filter ["@system-service", "@raw-io"] + options "--config.file=/etc/prometheus/ipmi_local.yml" + subscribes :restart, "template[/etc/prometheus/ipmi_local.yml]" end end @@ -190,13 +255,31 @@ service "irqbalance" do supports :status => false, :restart => true, :reload => false end -# Link Layer Discovery Protocol Daemon package "lldpd" + service "lldpd" do action [:start, :enable] supports :status => true, :restart => true, :reload => true end +ohai_plugin "lldp" do + template "lldp.rb.erb" +end + +package %w[ + rasdaemon + ruby-sqlite3 +] + +service "rasdaemon" do + action [:enable, :start] +end + +prometheus_exporter "rasdaemon" do + port 9797 + user "root" +end + tools_packages = [] status_packages = {} @@ -219,9 +302,6 @@ if node[:virtualization][:role] != "guest" || when "mpt2sas", "mpt3sas" tools_packages << "sas2ircu" status_packages["sas2ircu-status"] ||= [] - when "megaraid_mm" - tools_packages << "megactl" - status_packages["megaraid-status"] ||= [] when "megaraid_sas" tools_packages << "megacli" status_packages["megaclisas-status"] ||= [] @@ -265,7 +345,7 @@ if tools_packages.include?("areca") depth 1 user "root" group "root" - not_if { ENV["TEST_KITCHEN"] } + not_if { kitchen? } end else directory "/opt/areca" do @@ -274,62 +354,34 @@ else end end -if status_packages.include?("cciss-vol-status") - template "/usr/local/bin/cciss-vol-statusd" do - source "cciss-vol-statusd.erb" - owner "root" - group "root" - mode "755" - notifies :restart, "service[cciss-vol-statusd]" - end - - systemd_service "cciss-vol-statusd" do - description "Check cciss_vol_status values in the background" - exec_start "/usr/local/bin/cciss-vol-statusd" - private_tmp true - protect_system "full" - protect_home true - no_new_privileges true - notifies :restart, "service[cciss-vol-statusd]" - end -else - systemd_service "cciss-vol-statusd" do - action :delete - end - - template "/usr/local/bin/cciss-vol-statusd" do - action :delete - end -end +include_recipe "apt::hwraid" unless status_packages.empty? -%w[cciss-vol-status mpt-status sas2ircu-status megaraid-status megaclisas-status aacraid-status].each do |status_package| +%w[cciss-vol-status mpt-status sas2ircu-status megaclisas-status aacraid-status].each do |status_package| if status_packages.include?(status_package) package status_package - template "/etc/default/#{status_package}d" do - source "raid.default.erb" - owner "root" - group "root" - mode "644" - variables :devices => status_packages[status_package] + service "#{status_package}d" do + action [:stop, :disable] end - service "#{status_package}d" do - action [:start, :enable] - supports :status => false, :restart => true, :reload => false - subscribes :restart, "template[/etc/default/#{status_package}d]" + file "/etc/default/#{status_package}d" do + action :delete end else package status_package do action :purge end - - file "/etc/default/#{status_package}d" do - action :delete - end end end +systemd_service "cciss-vol-statusd" do + action :delete +end + +template "/usr/local/bin/cciss-vol-statusd" do + action :delete +end + disks = if node[:hardware][:disk] node[:hardware][:disk][:disks] else @@ -344,29 +396,37 @@ nvmes = if node[:hardware][:pci] [] end +unless nvmes.empty? + package "nvme-cli" +end + intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" } if !intel_ssds.empty? || !intel_nvmes.empty? package "unzip" - intel_ssd_tool_version = "3.0.27" - intel_ssd_package_version = "#{intel_ssd_tool_version}.400-1" + sst_tool_version = "1.3" + sst_package_version = "#{sst_tool_version}.208-0" - remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do - source "https://downloadmirror.intel.com/30065/eng/Intel_SSD_DCT_#{intel_ssd_tool_version}_Linux.zip" - end + # remote_file "#{Chef::Config[:file_cache_path]}/SST_CLI_Linux_#{sst_tool_version}.zip" do + # source "https://downloadmirror.intel.com/743764/SST_CLI_Linux_#{sst_tool_version}.zip" + # end - execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do - command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip isdct_#{intel_ssd_package_version}_amd64.deb" + execute "#{Chef::Config[:file_cache_path]}/SST_CLI_Linux_#{sst_tool_version}.zip" do + command "unzip SST_CLI_Linux_#{sst_tool_version}.zip sst_#{sst_package_version}_amd64.deb" cwd Chef::Config[:file_cache_path] user "root" group "root" - not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_amd64.deb") } + not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb") } end - dpkg_package "isdct" do - version "#{intel_ssd_package_version}" - source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_amd64.deb" + dpkg_package "sst" do + version "#{sst_package_version}" + source "#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb" + end + + dpkg_package "intelmas" do + action :purge end end @@ -404,7 +464,7 @@ disks = disks.map do |disk| munin = device end - next if device.nil? + next if device.nil? || munin.nil? Hash[ :device => device, @@ -464,6 +524,11 @@ if disks.count.positive? prometheus_collector "smart" do interval "15m" + user "root" + capability_bounding_set %w[CAP_DAC_OVERRIDE CAP_SYS_ADMIN CAP_SYS_RAWIO] + private_devices false + private_users false + protect_clock false end # Don't try and do munin monitoring of disks behind @@ -521,22 +586,27 @@ if File.exist?("/etc/mdadm/mdadm.conf") content mdadm_conf end - service "mdadm" do + service "mdmonitor" do action :nothing subscribes :restart, "file[/etc/mdadm/mdadm.conf]" end end -template "/etc/modules" do - source "modules.erb" - owner "root" - group "root" - mode "644" +file "/etc/modules" do + action :delete end -service "kmod" do - action :nothing - subscribes :start, "template[/etc/modules]" +node[:hardware][:modules].each do |module_name| + kernel_module module_name do + action :install + not_if { kitchen? } + end +end + +node[:hardware][:blacklisted_modules].each do |module_name| + kernel_module module_name do + action :blacklist + end end if node[:hardware][:watchdog] @@ -614,3 +684,14 @@ if node[:hardware][:shm_size] notifies :run, "execute[remount-dev-shm]" end end + +prometheus_collector "ohai" do + interval "15m" + user "root" + proc_subset "all" + capability_bounding_set %w[CAP_DAC_OVERRIDE CAP_SYS_ADMIN CAP_SYS_RAWIO] + private_devices false + private_users false + protect_clock false + protect_kernel_modules false +end