Handle unknown BMC manufacturers better

[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 21790a804d4db9794b51cf99ea02819344fe7c6c..09a9bced0db3291733ee8ea10cdb66935e30f207 100644 (file)
--- a/cookbooks/hardware/templates/default/ohai.rb.erb
+++ b/cookbooks/hardware/templates/default/ohai.rb.erb
@@ -796,7 +796,9 @@ Ohai.plugin(:Hardware) do
     device = {}
 
     IO.popen(["ipmitool", "mc", "info"]).each_with_object([]) do |line, devices|
     device = {}
 
     IO.popen(["ipmitool", "mc", "info"]).each_with_object([]) do |line, devices|

-      if line =~ /(Product [A-Z ]+[A-Z])\s*:\s+(.*\S)\s+\(.*\)\s*$/i
+      if line =~ /(Manufacturer [A-Z ]+[A-Z])\s*:\s+(.*\S)\s+\(.*\)\s*$/i
+        device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
+      elsif line =~ /(Product [A-Z ]+[A-Z])\s*:\s+(.*\S)\s+\(.*\)\s*$/i

         device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
       elsif line =~ /([A-Z ]+[A-Z])\s*:\s+(.*\S)\s*$/i
         device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
         device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)
       elsif line =~ /([A-Z ]+[A-Z])\s*:\s+(.*\S)\s*$/i
         device[Regexp.last_match(1).tr(" ", "_").downcase.to_sym] = Regexp.last_match(2)