Workaround apparent bug in chef-client 16.5

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 77c4356c30fa8a43cc84d9de7bf4c73b6d6eadde..c5b5ac226ef6d42c51a9c717d5e347ea0660da7f 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -86,12 +86,7 @@ when "TYAN"
 when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"
 when "TYAN Computer Corporation"
   units << "0"
 when "Supermicro"

-  case product
-  when "H8DGU", "X9SCD", "X7DBU", "X7DW3", "X9DR7/E-(J)LN4F", "X9DR3-F", "X9DRW", "SYS-1028U-TN10RT+", "SYS-2028U-TN24R4T+", "SYS-1029P-WTRT", "Super Server"
-    units << "1"
-  else
-    units << "0"
-  end
+  units << "1"

 when "IBM"
   units << "0"
 when "VMware, Inc."
 when "IBM"
   units << "0"
 when "VMware, Inc."


@@ -151,7 +146,7 @@ if File.exist?("/etc/default/grub")
     source "grub.erb"
     owner "root"
     group "root"
     source "grub.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :units => units, :entry => grub_entry
     notifies :run, "execute[update-grub]"
   end
     variables :units => units, :entry => grub_entry
     notifies :run, "execute[update-grub]"
   end


@@ -168,7 +163,7 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   source "initramfs-mdadm.erb"
   owner "root"
   group "root"
   source "initramfs-mdadm.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

   notifies :run, "execute[update-initramfs]"
 end
 
   notifies :run, "execute[update-initramfs]"
 end
 


@@ -197,7 +192,9 @@ tools_packages = []
 status_packages = {}
 
 if node[:virtualization][:role] != "guest" ||
 status_packages = {}
 
 if node[:virtualization][:role] != "guest" ||

-   node[:virtualization][:system] != "lxd"
+   (node[:virtualization][:system] != "lxc" &&
+    node[:virtualization][:system] != "lxd" &&
+    node[:virtualization][:system] != "openvz")

 
   node[:kernel][:modules].each_key do |modname|
     case modname
 
   node[:kernel][:modules].each_key do |modname|
     case modname


@@ -273,7 +270,7 @@ if status_packages.include?("cciss-vol-status")
     source "cciss-vol-statusd.erb"
     owner "root"
     group "root"
     source "cciss-vol-statusd.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

     notifies :restart, "service[cciss-vol-statusd]"
   end
 
     notifies :restart, "service[cciss-vol-statusd]"
   end
 


@@ -304,7 +301,7 @@ end
       source "raid.default.erb"
       owner "root"
       group "root"
       source "raid.default.erb"
       owner "root"
       group "root"

-      mode 0o644
+      mode "644"

       variables :devices => status_packages[status_package]
     end
 
       variables :devices => status_packages[status_package]
     end
 


@@ -343,23 +340,23 @@ 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_ssd_tool_version = "3.0.24"
+  intel_ssd_tool_version = "3.0.25"

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

-    source "https://downloadmirror.intel.com/29399/eng/Intel_SSD_DCT_#{intel_ssd_tool_version}_Linux%20.zip"
+    source "https://downloadmirror.intel.com/29556/eng/Intel_SSD_Data_Center_Tool_#{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
   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}-1_amd64.deb"
+    command "unzip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux.zip Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux/isdct_#{intel_ssd_tool_version}-1_amd64.deb"

     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"
     cwd Chef::Config[:file_cache_path]
     user "root"
     group "root"

-    not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }
+    not_if { ::File.exist?("#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux/isdct_#{intel_ssd_tool_version}-1_amd64.deb") }

   end
 
   dpkg_package "isdct" do
     version "#{intel_ssd_tool_version}-1"
   end
 
   dpkg_package "isdct" do
     version "#{intel_ssd_tool_version}-1"

-    source "#{Chef::Config[:file_cache_path]}/isdct_#{intel_ssd_tool_version}-1_amd64.deb"
+    source "#{Chef::Config[:file_cache_path]}/Intel_SSD_Data_Center_Tool_#{intel_ssd_tool_version}_Linux/isdct_#{intel_ssd_tool_version}-1_amd64.deb"

   end
 end
 
   end
 end
 


@@ -405,18 +402,25 @@ disks = disks.compact.uniq
 if disks.count.positive?
   package "smartmontools"
 
 if disks.count.positive?
   package "smartmontools"
 

+  template "/etc/cron.daily/update-smart-drivedb" do
+    source "update-smart-drivedb.erb"
+    owner "root"
+    group "root"
+    mode "755"
+  end
+

   template "/usr/local/bin/smartd-mailer" do
     source "smartd-mailer.erb"
     owner "root"
     group "root"
   template "/usr/local/bin/smartd-mailer" do
     source "smartd-mailer.erb"
     owner "root"
     group "root"

-    mode 0o755
+    mode "755"

   end
 
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
     group "root"
   end
 
   template "/etc/smartd.conf" do
     source "smartd.conf.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :disks => disks
   end
 
     variables :disks => disks
   end
 


@@ -424,10 +428,10 @@ if disks.count.positive?
     source "smartmontools.erb"
     owner "root"
     group "root"
     source "smartmontools.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

   end
 
   end
 

-  service "smartd" do
+  service "smartmontools" do

     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"
     action [:enable, :start]
     subscribes :reload, "template[/etc/smartd.conf]"
     subscribes :restart, "template[/etc/default/smartmontools]"


@@ -484,7 +488,7 @@ if File.exist?("/etc/mdadm/mdadm.conf")
   file "/etc/mdadm/mdadm.conf" do
     owner "root"
     group "root"
   file "/etc/mdadm/mdadm.conf" do
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     content mdadm_conf
   end
 
     content mdadm_conf
   end
 


@@ -498,7 +502,7 @@ template "/etc/modules" do
   source "modules.erb"
   owner "root"
   group "root"
   source "modules.erb"
   owner "root"
   group "root"

-  mode 0o644
+  mode "644"

 end
 
 service "kmod" do
 end
 
 service "kmod" do


@@ -513,7 +517,7 @@ if node[:hardware][:watchdog]
     source "watchdog.erb"
     owner "root"
     group "root"
     source "watchdog.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     variables :module => node[:hardware][:watchdog]
   end
 
     variables :module => node[:hardware][:watchdog]
   end
 


@@ -560,7 +564,7 @@ unless Dir.glob("/sys/class/hwmon/hwmon*").empty?
     source "sensors.conf.erb"
     owner "root"
     group "root"
     source "sensors.conf.erb"
     owner "root"
     group "root"

-    mode 0o644
+    mode "644"

     notifies :run, "execute[/etc/sensors.d/chef.conf]"
   end
 end
     notifies :run, "execute[/etc/sensors.d/chef.conf]"
   end
 end