From: Tom Hughes <tom@compton.nu>
Date: Tue, 5 Jan 2021 07:05:43 +0000 (+0000)
Subject: Disable installation of Intel SSD tool
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/1d12eab89c40bd700fb1e6d9de913eccb6999ad7

Disable installation of Intel SSD tool
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 149ed47f0..1a0c8848c 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -336,39 +336,39 @@ 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.27"
-  intel_ssd_package_version = "#{intel_ssd_tool_version}.400-1"
-
-  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
-
-  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"
-    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") }
-  end
-
-  dpkg_package "isdct" do
-    version "#{intel_ssd_package_version}"
-    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_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.27"
+#   intel_ssd_package_version = "#{intel_ssd_tool_version}.400-1"
+
+#   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
+
+#   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"
+#     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") }
+#   end
+
+#   dpkg_package "isdct" do
+#     version "#{intel_ssd_package_version}"
+#     source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_amd64.deb"
+#   end
+# end
 
 disks = disks.map do |disk|
   next if disk[:state] == "spun_down" || %w[unconfigured failed].any?(disk[:status])