X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0b9094fa2286604273de222f201b17a925738bd3..3369f9515111a99387cda562a342f94ea1a13778:/cookbooks/hardware/recipes/default.rb diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index dd2f905ca..fe185248b 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -86,12 +86,7 @@ when "TYAN" when "TYAN Computer Corporation" units << "0" when "Supermicro" - case product - when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-1028U-TN10RT+", "SYS-2028U-TN24R4T+", "SYS-1029P-WTRT", "Super Server" - units << "1" - else - units << "0" - end + units << "1" when "IBM" units << "0" when "VMware, Inc." @@ -181,17 +176,9 @@ package "ipmitool" if node[:kernel][:modules].include?("ipmi_si") package "irqbalance" -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 # Link Layer Discovery Protocol Daemon @@ -205,7 +192,9 @@ tools_packages = [] status_packages = {} if node[:virtualization][:role] != "guest" || - node[:virtualization][:system] != "lxd" + (node[:virtualization][:system] != "lxc" && + node[:virtualization][:system] != "lxd" && + node[:virtualization][:system] != "openvz") node[:kernel][:modules].each_key do |modname| case modname @@ -338,38 +327,38 @@ disks = if node[:hardware][:disk] [] end -# intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ } -# -# nvmes = if node[:hardware][:pci] -# node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" } -# else -# [] -# 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.21" -# -# remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do -# source "https://downloadmirror.intel.com/29115/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.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_tool_version}-1_amd64.deb" -# cwd Chef::Config[:file_cache_path] -# user "root" -# group "root" -# not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") } -# end -# -# dpkg_package "isdct" do -# version "#{intel_ssd_tool_version}-1" -# source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb" -# end -# end +intel_ssds = disks.select { |d| d[:vendor] == "INTEL" && d[:model] =~ /^SSD/ } + +nvmes = if node[:hardware][:pci] + node[:hardware][:pci].values.select { |pci| pci[:driver] == "nvme" } + else + [] + 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.24" + + remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do + source "https://downloadmirror.intel.com/29399/eng/Intel_SSD_DCT_#{intel_ssd_tool_version}_Linux%20.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_tool_version}-1_amd64.deb" + cwd Chef::Config[:file_cache_path] + user "root" + group "root" + not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") } + end + + dpkg_package "isdct" do + version "#{intel_ssd_tool_version}-1" + source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb" + end +end disks = disks.map do |disk| next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])