Handle disks attached to a Fusion-MPT controller but not in an array

[chef.git] / cookbooks / hardware / templates / default / ohai.rb.erb

diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb
index 88c620fd1d47eb0c6987896641e5292426b43259..2874f3d65898bf9371ad680f3afdb8792380267c 100644 (file)
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -435,9 +435,7 @@ Ohai.plugin(:Hardware) do
           controller[:arrays] << array[:id]
 
           arrays << array
           controller[:arrays] << array[:id]
 
           arrays << array

-
-          disk = nil
-        elsif array && line =~ /^Device is a Hard disk$/
+        elsif line =~ /^Device is a Hard disk$/

           disk = {
             :id => devices[:disks].count,
             :controller => controller[:id],
           disk = {
             :id => devices[:disks].count,
             :controller => controller[:id],