From: Tom Hughes <tom@compton.nu>
Date: Mon, 14 Dec 2015 11:57:59 +0000 (+0000)
Subject: Handle unknown BMC manufacturers better
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/9360c6961050e2730b750afc41ec3e240dda3f30?hp=1a009f619cf5c96756ccaa1b8f14ddd9d4f34c0b

Handle unknown BMC manufacturers better
---

diff --git a/cookbooks/hardware/templates/default/ohai.rb.erb b/cookbooks/hardware/templates/default/ohai.rb.erb
index 21790a804..09a9bced0 100644
--- 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|
-      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)