X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/46230812e0c9de44789e26349ad8686bd27cff36..564078a3982b842263892d7fe758f4adbcb5117f:/cookbooks/hardware/recipes/default.rb diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb index 35e31ea2e..060229deb 100644 --- a/cookbooks/hardware/recipes/default.rb +++ b/cookbooks/hardware/recipes/default.rb @@ -1,14 +1,14 @@ # -# Cookbook Name:: hardware +# Cookbook:: hardware # Recipe:: default # -# Copyright 2012, OpenStreetMap Foundation +# Copyright:: 2012, OpenStreetMap Foundation # # Licensed under the Apache License, Version 2.0 (the "License"); # 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, @@ -17,8 +17,11 @@ # limitations under the License. # -include_recipe "tools" +include_recipe "apt" +include_recipe "git" include_recipe "munin" +include_recipe "sysfs" +include_recipe "tools" ohai_plugin "hardware" do template "ohai.rb.erb" @@ -27,13 +30,8 @@ end case node[:cpu][:"0"][:vendor_id] when "GenuineIntel" package "intel-microcode" -end - -case node[:cpu][:"0"][:vendor_id] when "AuthenticAMD" - if node[:lsb][:release].to_f >= 14.04 - package "amd64-microcode" - end + package "amd64-microcode" end if node[:dmi] && node[:dmi][:system] @@ -59,7 +57,29 @@ end case manufacturer when "HP" package "hponcfg" - package "hp-health" + + package "hp-health" do + action :install + notifies :restart, "service[hp-health]" + end + + service "hp-health" do + action [:enable, :start] + 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" @@ -67,62 +87,38 @@ 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+" + 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 when "IBM" units << "0" -end +when "VMware, Inc." + package "open-vm-tools" -# Remove legacy HP G4 support which breaks modern hp-health 10.4 -if manufacturer == "HP" - file "/opt/hp/hp-health/bin/hpasmd" do - action :delete - end - file "/usr/lib/libhpasmintrfc.so.3.0" do + # Remove timeSync plugin completely + # https://github.com/vmware/open-vm-tools/issues/302 + file "/usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so" do action :delete + notifies :restart, "service[open-vm-tools]" end - file "/usr/lib/libhpasmintrfc.so.3" do - action :delete - end - - file "/usr/lib/libhpasmintrfc.so" do - action :delete + # Attempt to tell Host we are not interested in timeSync + execute "vmware-toolbox-cmd-timesync-disable" do + command "/usr/bin/vmware-toolbox-cmd timesync disable" + ignore_failure true end - directory "/opt/hp/hp-legacy" do - action :delete - recursive true + service "open-vm-tools" do + action [:enable, :start] + supports :status => true, :restart => 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 @@ -136,6 +132,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 @@ -180,25 +177,28 @@ service "haveged" do action [:enable, :start] end -if node[:kernel][:modules].include?("ipmi_si") - package "ipmitool" -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 +207,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 +244,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,9 +259,11 @@ 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" + depth 1 user "root" group "root" + not_if { ENV["TEST_KITCHEN"] } end else directory "/opt/areca" do @@ -270,7 +272,27 @@ else end end -["cciss-vol-status", "mpt-status", "sas2ircu-status", "megaraid-status", "megaclisas-status", "aacraid-status"].each do |status_package| +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 0o755 + 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 +end + +%w[cciss-vol-status mpt-status sas2ircu-status megaraid-status megaclisas-status aacraid-status].each do |status_package| if status_packages.include?(status_package) package status_package @@ -304,61 +326,61 @@ 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" - 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" - end - - execute "unzip-DataCenterTool" do - command "unzip DataCenterTool_3_0_0_Linux.zip 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-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") } - end - - dpkg_package "isdct" do - source "#{Chef::Config[:file_cache_path]}/isdct_3.0.0.400-16_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.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 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] =~ %r{^/dev/(nvme\d+)n\d+$} + device = Regexp.last_match(1) + munin = device elsif disk[:device] device = disk[:device].sub("/dev/", "") munin = device @@ -374,15 +396,9 @@ disks = disks.map do |disk| ] end -smartd_service = if node[:lsb][:release].to_f >= 16.04 - "smartd" - else - "smartmontools" - end +disks = disks.compact.uniq -disks = disks.compact - -if disks.count > 0 +if disks.count.positive? package "smartmontools" template "/usr/local/bin/smartd-mailer" do @@ -407,7 +423,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 +433,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 +443,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 +466,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 +497,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] @@ -556,3 +560,20 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty? notifies :run, "execute[/etc/sensors.d/chef.conf]" end end + +if node[:hardware][:shm_size] + execute "remount-dev-shm" do + action :nothing + command "/bin/mount -o remount /dev/shm" + user "root" + group "root" + end + + mount "/dev/shm" do + action :enable + device "tmpfs" + fstype "tmpfs" + options "rw,nosuid,nodev,size=#{node[:hardware][:shm_size]}" + notifies :run, "execute[remount-dev-shm]" + end +end