Add more ssh host keys

[chef.git] / cookbooks / hardware / recipes / default.rb

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index ebdf64bb116c09b790f10c44c46bba62990b4d9e..596d2701d94bec4c15b0683ea25c0578a4a36db1 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -141,7 +141,7 @@ if File.exist?("/etc/default/grub")
   execute "update-grub" do
     action :nothing
     command "/usr/sbin/update-grub"
   execute "update-grub" do
     action :nothing
     command "/usr/sbin/update-grub"

-    not_if { ENV["TEST_KITCHEN"] }
+    not_if { kitchen? }

   end
 
   template "/etc/default/grub" do
   end
 
   template "/etc/default/grub" do


@@ -274,7 +274,7 @@ if tools_packages.include?("areca")
     depth 1
     user "root"
     group "root"
     depth 1
     user "root"
     group "root"

-    not_if { ENV["TEST_KITCHEN"] }
+    not_if { kitchen? }

   end
 else
   directory "/opt/areca" do
   end
 else
   directory "/opt/areca" do


@@ -358,11 +358,11 @@ intel_nvmes = nvmes.select { |pci| pci[:vendor_name] == "Intel Corporation" }
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 
 if !intel_ssds.empty? || !intel_nvmes.empty?
   package "unzip"
 

-  intel_mas_tool_version = "1.6"
-  intel_mas_package_version = "#{intel_mas_tool_version}.122-0"
+  intel_mas_tool_version = "1.10"
+  intel_mas_package_version = "#{intel_mas_tool_version}.155-0"

 
   remote_file "#{Chef::Config[:file_cache_path]}/Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do
 
   remote_file "#{Chef::Config[:file_cache_path]}/Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do

-    source "https://downloadmirror.intel.com/30259/eng/Intel%C2%AE_MAS_CLI_Tool_Linux_#{intel_mas_tool_version}.zip"
+    source "https://downloadmirror.intel.com/646992/Intel_MAS_CLI_Tool_Linux_#{intel_mas_tool_version}-v2.zip"

   end
 
   execute "#{Chef::Config[:file_cache_path]}/Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do
   end
 
   execute "#{Chef::Config[:file_cache_path]}/Intel_MAS_CLI_Tool_#{intel_mas_tool_version}_Linux.zip" do