Don't use ||= in attributes files as it doesn't work

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

diff --git a/cookbooks/hardware/recipes/default.rb b/cookbooks/hardware/recipes/default.rb
index a602852539a66b8575ac4967bbba7da7fda1fa49..9fa225d2669d00145d9fd2e1f451f3f0225f9428 100644 (file)
--- a/cookbooks/hardware/recipes/default.rb
+++ b/cookbooks/hardware/recipes/default.rb
@@ -106,7 +106,7 @@ unless unit.nil?
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false
     provider Chef::Provider::Service::Upstart
     action [ :enable, :start ]
     supports :status => true, :restart => true, :reload => false

-    subscribes :restart, resources(:template => "/etc/init/ttyS#{unit}.conf")
+    subscribes :restart, "template[/etc/init/ttyS#{unit}.conf]"

   end
 end
 
   end
 end
 


@@ -122,7 +122,7 @@ if File.exist?("/etc/default/grub")
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed
     group "root"
     mode 0644
     variables :unit => unit, :speed => speed

-    notifies :run, resources(:execute => "update-grub")
+    notifies :run, "execute[update-grub]"

   end
 end
 
   end
 end
 


@@ -141,30 +141,59 @@ template "/etc/initramfs-tools/conf.d/mdadm" do
   notifies :run, "execute[update-initramfs]"
 end
 
   notifies :run, "execute[update-initramfs]"
 end
 

-["cciss", "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"
+    tools_packages << "hpacucli"
+    status_packages["cciss-vol-status"] ||= []

   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)
+node[:block_device].each do |name,attributes|
+  if attributes[:vendor] == "HP" and attributes[:model] == "LOGICAL VOLUME"
+    if name =~ /^cciss!(c[0-9]+)d[0-9]+$/
+      status_packages["cciss-vol-status"] |= [ "cciss/#{$1}d0" ]
+    else
+      Dir.glob("/sys/block/#{name}/device/scsi_generic/*").each do |sg|
+        status_packages["cciss-vol-status"] |= [ File.basename(sg) ]
+      end
+    end
+  end
+end
+
+["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
     package status_package
 
     template "/etc/default/#{status_package}d" do


@@ -172,6 +201,7 @@ end
       owner "root"
       group "root"
       mode 0644
       owner "root"
       group "root"
       mode 0644

+      variables :devices => status_packages[status_package]

     end
 
     service "#{status_package}d" do
     end
 
     service "#{status_package}d" do


@@ -184,10 +214,6 @@ end
       action :purge
     end
 
       action :purge
     end
 

-    package tools_package do
-      action :purge
-    end
-

     file "/etc/default/#{status_package}d" do
       action :delete
     end
     file "/etc/default/#{status_package}d" do
       action :delete
     end