Remove firewall special casing for boitata
authorTom Hughes <tom@compton.nu>
Mon, 18 Mar 2019 14:33:25 +0000 (14:33 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 18 Mar 2019 16:46:58 +0000 (16:46 +0000)
cookbooks/hardware/recipes/default.rb
roles/boitata.rb

index 8da9b9b9aea029508891740aefbef18371a0db67..2fa629adfa09c5a674a07aeae25e6c8466add21e 100644 (file)
@@ -294,21 +294,23 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
-  remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.19_Linux.zip" do
-    source "https://downloadmirror.intel.com/28639/eng/Intel_SSD_Data_Center_Tool_3.0.19_Linux.zip"
+  intel_ssd_tool_version = "3.0.19"
+
+  remote_file "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip" do
+    source "https://downloadmirror.intel.com/28639/eng/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip"
   end
 
-  execute "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip" do
-    command "unzip Intel_SSD_Data_Center_Tool_3.0.13_Linux.zip isdct_3.0.13.400-17_amd64.deb"
+  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}-1_amd64.deb"
     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"
-    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_3.0.13.400-17_amd64.deb") }
+    not_if { File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }
   end
 
   dpkg_package "isdct" do
-    version "3.0.13.400-17"
-    source "#{Chef::Config[:file_cache_path]}/isdct_3.0.13.400-17_amd64.deb"
+    version "#{intel_ssd_tool_version}-1"
+    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb"
   end
 end
 
index 8bf964a60392e9ab4897faa847d916256b71b650..d0fcef8d3fbeb03a46b675cf831675ec66a317f1 100644 (file)
@@ -3,12 +3,6 @@ description "Master role applied to boitata"
 
 default_attributes(
   :networking => {
-    :firewall => {
-      :log => false,
-      :mark => false,
-      :raw => false,
-      :mangle => false
-    },
     :interfaces => {
       :external_ipv4 => {
         :interface => "ens3",