Install curl on the dev server

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index 4122a7ac8e5172d25855e369dc17abb0d111e880..6ea634ee9e088010fdce78588957b5d759f0ce29 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -331,6 +331,8 @@ if node[:virtualization][:role] != "guest" ||
   end
 end
 
+include_recipe "apt::hwraid" unless status_packages.empty?
+
 %w[ssacli lsiutil sas2ircu megactl megacli arcconf].each do |tools_package|
   if tools_packages.include?(tools_package)
     package tools_package
@@ -359,8 +361,6 @@ else
   end
 end
 
-include_recipe "apt::hwraid" unless status_packages.empty?
-
 %w[cciss-vol-status mpt-status sas2ircu-status megaclisas-status aacraid-status].each do |status_package|
   if status_packages.include?(status_package)
     package status_package
@@ -465,6 +465,10 @@ end
 disks = disks.compact.uniq
 
 if disks.count.positive?
+  apt_preference "smartmontools" do
+    action :remove
+  end
+
   package "smartmontools"
 
   template "/etc/cron.daily/update-smart-drivedb" do