Merge remote-tracking branch 'github/pull/590'

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 49af1f52eb069d672839c0ec40ebb27f6cf1d864..5e48994764716fc93232bcdddeabbac66fed82a4 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -28,11 +28,13 @@ ohai_plugin "hardware" do
   template "ohai.rb.erb"
 end
 
   template "ohai.rb.erb"
 end
 

-case node[:cpu][:"0"][:vendor_id]
-when "GenuineIntel"
-  package "intel-microcode"
-when "AuthenticAMD"
-  package "amd64-microcode"
+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]
 end
 
 if node[:dmi] && node[:dmi][:system]


@@ -56,19 +58,35 @@ if node[:roles].include?("bytemark") || node[:roles].include?("exonetric") || no
 end
 
 case manufacturer
 end
 
 case manufacturer

-when "HP"
+when "HP", "HPE"
+  include_recipe "apt::management-component-pack"
+

   package "hponcfg"
 
   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]"
   package "hp-health" do
     action :install
     notifies :restart, "service[hp-health]"

-    only_if { node[:lsb][:release].to_f < 22.04 }
+    only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 }

   end
 
   service "hp-health" do
     action [:enable, :start]
     supports :status => true, :restart => true
   end
 
   service "hp-health" do
     action [:enable, :start]
     supports :status => true, :restart => true

-    only_if { node[:lsb][:release].to_f < 22.04 }
+    only_if { platform?("ubuntu") && node[:lsb][:release].to_f < 22.04 }

   end
 
   if product.end_with?("Gen8", "Gen9")
   end
 
   if product.end_with?("Gen8", "Gen9")


@@ -81,9 +99,23 @@ when "HP"
       action [:enable, :start]
       supports :status => true, :restart => true
     end
       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
 
   end
 

-  units << "1"
+  units << if product.end_with?("Gen10")
+             "0"
+           else
+             "1"
+           end

 when "TYAN"
   units << "0"
 when "TYAN Computer Corporation"
 when "TYAN"
   units << "0"
 when "TYAN Computer Corporation"


@@ -117,6 +149,7 @@ end
 units.sort.uniq.each do |unit|
   service "serial-getty@ttyS#{unit}" do
     action [:enable, :start]
 units.sort.uniq.each do |unit|
   service "serial-getty@ttyS#{unit}" do
     action [:enable, :start]

+    not_if { kitchen? }

   end
 end
 
   end
 end
 


@@ -156,6 +189,8 @@ if File.exist?("/etc/default/grub")
   end
 end
 
   end
 end
 

+package "initramfs-tools"
+

 execute "update-initramfs" do
   action :nothing
   command "update-initramfs -u -k all"
 execute "update-initramfs" do
   action :nothing
   command "update-initramfs -u -k all"


@@ -171,9 +206,20 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
   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")
 end
 
 if node[:kernel][:modules].include?("ipmi_si")


@@ -189,6 +235,10 @@ if node[:kernel][:modules].include?("ipmi_si")
 
   prometheus_exporter "ipmi" do
     port 9290
 
   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
     options "--config.file=/etc/prometheus/ipmi_local.yml"
     subscribes :restart, "template[/etc/prometheus/ipmi_local.yml]"
   end


@@ -212,6 +262,20 @@ ohai_plugin "lldp" do
   template "lldp.rb.erb"
 end
 
   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 = {}
 
 tools_packages = []
 status_packages = {}
 


@@ -234,9 +298,6 @@ if node[:virtualization][:role] != "guest" ||
     when "mpt2sas", "mpt3sas"
       tools_packages << "sas2ircu"
       status_packages["sas2ircu-status"] ||= []
     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"] ||= []
     when "megaraid_sas"
       tools_packages << "megacli"
       status_packages["megaclisas-status"] ||= []


@@ -289,62 +350,34 @@ else
   end
 end
 
   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
+include_recipe "apt::hwraid" unless status_packages.empty?

 
 

-  template "/usr/local/bin/cciss-vol-statusd" do
-    action :delete
-  end
-end
-
-%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
 
   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
 
     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
     end
   else
     package status_package do
       action :purge
     end

-
-    file "/etc/default/#{status_package}d" do
-      action :delete
-    end

   end
 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
 disks = if node[:hardware][:disk]
           node[:hardware][:disk][:disks]
         else


@@ -368,27 +401,27 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 

-  intel_mas_tool_version = "1.10"
-  intel_mas_package_version = "#{intel_mas_tool_version}.155-0"
+  sst_tool_version = "1.3"
+  sst_package_version = "#{sst_tool_version}.208-0"

 
 

-  remote_file "#{Chef::Config[:file_cache_path]}/Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do
-    source "https://downloadmirror.intel.com/646992/Intel_MAS_CLI_Tool_Linux_#{intel_mas_tool_version}-v2.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_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do
-    command "unzip Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip intelmas_#{intel_mas_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"
     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"

-    not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/intelmas_#{intel_mas_package_version}_amd64.deb") }
+    not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/sst_#{sst_package_version}_amd64.deb") }

   end
 
   end
 

-  dpkg_package "intelmas" do
-    version "#{intel_mas_package_version}"
-    source "#{Chef::Config[:file_cache_path]}/intelmas_#{intel_mas_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
 
   end
 

-  dpkg_package "isdct" do
+  dpkg_package "intelmas" do

     action :purge
   end
 end
     action :purge
   end
 end


@@ -427,7 +460,7 @@ disks = disks.map do |disk|
     munin = device
   end
 
     munin = device
   end
 

-  next if device.nil?
+  next if device.nil? || munin.nil?

 
   Hash[
     :device => device,
 
   Hash[
     :device => device,


@@ -487,6 +520,11 @@ if disks.count.positive?
 
   prometheus_collector "smart" do
     interval "15m"
 
   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
   end
 
   # Don't try and do munin monitoring of disks behind


@@ -544,7 +582,7 @@ if File.exist?("/etc/mdadm/mdadm.conf")
     content mdadm_conf
   end
 
     content mdadm_conf
   end
 

-  service "mdadm" do
+  service "mdmonitor" do

     action :nothing
     subscribes :restart, "file[/etc/mdadm/mdadm.conf]"
   end
     action :nothing
     subscribes :restart, "file[/etc/mdadm/mdadm.conf]"
   end


@@ -642,3 +680,14 @@ if node[:hardware][:shm_size]
     notifies :run, "execute[remount-dev-shm]"
   end
 end
     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