X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ea48ac6d563c698f43fd018f40ca84f7ec28f110..d6c3c3bc6b45204974784125bd0843a0b28ce9aa:/cookbooks/hardware/recipes/default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 5609bd34b..598f95c53 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -85,7 +85,7 @@ when "HP", "HPE"
     only_if { node[:lsb][:release].to_f < 22.04 }
   end
 
-  if product.end_with?("Gen8", "Gen9", "Gen10")
+  if product.end_with?("Gen8", "Gen9")
     package "hp-ams" do
       action :install
       notifies :restart, "service[hp-ams]"
@@ -95,9 +95,23 @@ when "HP", "HPE"
       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"
@@ -395,11 +409,11 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
-  sst_tool_version = "1.3"
-  sst_package_version = "#{sst_tool_version}.208-0"
+  sst_tool_version = "2.1"
+  sst_package_version = "#{sst_tool_version}.352-0"
 
   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"
+    source "https://downloadmirror.intel.com/737923/SST_CLI_Linux_#{sst_tool_version}.zip"
   end
 
   execute "#{Chef::Config[:file_cache_path]}/SST_CLI_Linux_#{sst_tool_version}.zip" do
@@ -571,7 +585,7 @@ 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