From: Tom Hughes <tom@compton.nu>
Date: Fri, 13 Nov 2020 10:12:31 +0000 (+0000)
Subject: Avoid repeated reinstallations of isdct
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/b264f056bac40543e79cde313958e101cb90ec7e

Avoid repeated reinstallations of isdct
---

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 42d2e9117..188042514 100644
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -350,22 +350,23 @@ if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
   intel_ssd_tool_version = "3.0.26"
+  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/29720/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_tool_version}.400-1_amd64.deb"
+    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_tool_version}.400-1_amd64.deb") }
+    not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_amd64.deb") }
   end
 
   dpkg_package "isdct" do
-    version "#{intel_ssd_tool_version}-1"
-    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}.400-1_amd64.deb"
+    version "#{intel_ssd_package_version}"
+    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_package_version}_amd64.deb"
   end
 end