Avoid repeated purge/install cycles for hpacucli

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index c568cafd42d6a43d7fc8d7361f2b33f5478c3a27..ad64ae56ba143de40a39e709415b213d231a888e 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -141,62 +141,67 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
   notifies :run, "execute[update-initramfs]"
 end
 

-["cciss", "hpsa", "mptsas", "mpt2sas", "megaraid_mm", "megaraid_sas", "aacraid"].each do |raidmod|
-  case raidmod
+tools_packages = []
+status_packages = []
+
+node[:kernel][:modules].each_key do |modname|
+  case modname

   when "cciss"
   when "cciss"

-    tools_package = "hpacucli"
-    status_package = "cciss-vol-status"
+    tools_packages << "hpacucli"
+    status_packages << "cciss-vol-status"

   when "hpsa"
   when "hpsa"

-    tools_package = "hpacucli"
+    tools_packages << "hpacucli"

   when "mptsas"
   when "mptsas"

-    tools_package = "lsiutil"
-    status_package = "mpt-status"
+    tools_packages << "lsiutil"
+    status_packages << "mpt-status"

   when "mpt2sas"
   when "mpt2sas"

-    tools_package = "sas2ircu"
-    status_package = "sas2ircu-status"
+    tools_packages << "sas2ircu"
+    status_packages << "sas2ircu-status"

   when "megaraid_mm"
   when "megaraid_mm"

-    tools_package = "megactl"
-    status_package = "megaraid-status"
+    tools_packages << "megactl"
+    status_packages << "megaraid-status"

   when "megaraid_sas"
   when "megaraid_sas"

-    tools_package = "megacli"
-    status_package = "megaclisas-status"
+    tools_packages << "megacli"
+    status_packages << "megaclisas-status"

   when "aacraid"
   when "aacraid"

-    tools_package = "arcconf"
-    status_package = "aacraid-status"
+    tools_packages << "arcconf"
+    status_packages << "aacraid-status"

   end
   end

+end

 
 

-  if node[:kernel][:modules].include?(raidmod)
+["hpacucli", "lsiutil", "sas2ircu", "megactl", "megacli", "arcconf"].each do |tools_package|
+  if tools_packages.include?(tools_package)

     package tools_package
     package tools_package

+  else
+    package tools_package do
+      action :purge
+    end
+  end
+end
+
+["cciss-vol-status", "mpt-status", "sas2ircu-status", "megaraid-status", "megaclisas-status", "aacraid-status"].each do |status_package|
+  if status_packages.include?(status_package)
+    package status_package
+
+    template "/etc/default/#{status_package}d" do
+      source "raid.default.erb"
+      owner "root"
+      group "root"
+      mode 0644
+    end

 
 

-    if status_package
-      package status_package
-
-      template "/etc/default/#{status_package}d" do
-        source "raid.default.erb"
-        owner "root"
-        group "root"
-        mode 0644
-      end
-
-      service "#{status_package}d" do
-        action [ :start, :enable ]
-        supports :status => false, :restart => true, :reload => false
-        subscribes :restart, "template[/etc/default/#{status_package}d]"
-      end
+    service "#{status_package}d" do
+      action [ :start, :enable ]
+      supports :status => false, :restart => true, :reload => false
+      subscribes :restart, "template[/etc/default/#{status_package}d]"

     end
   else
     end
   else

-    if status_package
-      package status_package do
-        action :purge
-      end
-
-      file "/etc/default/#{status_package}d" do
-        action :delete
-      end
+    package status_package do
+      action :purge

     end
 
     end
 

-    package tools_package do
-      action :purge
+    file "/etc/default/#{status_package}d" do
+      action :delete

     end
   end
 end
     end
   end
 end