]> git.openstreetmap.org Git - chef.git/commitdiff
Disable installation of Intel SSD tool
authorTom Hughes <tom@compton.nu>
Tue, 5 Jan 2021 07:05:43 +0000 (07:05 +0000)
committerTom Hughes <tom@compton.nu>
Tue, 5 Jan 2021 07:26:33 +0000 (07:26 +0000)
cookbooks/hardware/recipes/default.rb

index 149ed47f0d27249ff22f25c9adc97ed47b15c45c..1a0c8848ca45749254d4583d4351b2d2cdda65e2 100644 (file)
@@ -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])