Handle unknown BMC manufacturers better
authorTom Hughes <tom@compton.nu>
Mon, 14 Dec 2015 11:57:59 +0000 (11:57 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 14 Dec 2015 11:57:59 +0000 (11:57 +0000)
cookbooks/hardware/templates/default/ohai.rb.erb

index 21790a8..09a9bce 100644 (file)
@@ -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)