X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/4ed87e86c638523d093bc97b32715c4c6a41a70d..cf163679e4cf9c867cde63fe724ba3e578660d0a:/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 c7d245b94..6e6e5f37e 100644 --- a/cookbooks/hardware/templates/default/ohai.rb.erb +++ b/cookbooks/hardware/templates/default/ohai.rb.erb @@ -426,6 +426,7 @@ Ohai.plugin(:Hardware) do def find_megaraid_disks(devices) controllers = [] arrays = [] + disks = [] controller = nil array = nil @@ -496,6 +497,8 @@ Ohai.plugin(:Hardware) do devices[:disks] << disk controller[:disks] << disk[:id] array[:disks] << disk[:id] + + disks << disk elsif disk && line =~ /^Firmware state:\s+(\S.*)$/ status, state = Regexp.last_match(1).split(/,\s*/) case status @@ -516,7 +519,7 @@ Ohai.plugin(:Hardware) do end elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) - when "Device Id" then disk[:smart_device] = "megaraid,#{Regexp.last_match(2)}" + when "Device Id" then disk[:device_id] = Regexp.last_match(2) when "WWN" then disk[:wwn] = Regexp.last_match(2) when "PD Type" then disk[:interface] = Regexp.last_match(2) when "Raw Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, "")) @@ -546,7 +549,8 @@ Ohai.plugin(:Hardware) do controller = controllers[Regexp.last_match(1).to_i] elsif controller && line =~ /^Enclosure Device ID: \d+$/ disk = { - :controller => controller[:id] + :controller => controller[:id], + :arrays => [] } elsif disk && line =~ /^WWN:\s+(\S+)$/ unless devices[:disks].find { |d| d[:wwn] == Regexp.last_match(1) } @@ -554,6 +558,8 @@ Ohai.plugin(:Hardware) do disk[:wwn] = Regexp.last_match(1) devices[:disks] << disk + + disks << disk end elsif disk && line =~ /^Firmware state:\s+(\S.*)$/ status, state = Regexp.last_match(1).split(/,\s*/) @@ -575,7 +581,7 @@ Ohai.plugin(:Hardware) do end elsif disk && line =~ /^(\S.*\S)\s*:\s+(\S.*)$/ case Regexp.last_match(1) - when "Device Id" then disk[:smart_device] = "megaraid,#{Regexp.last_match(2)}" + when "Device Id" then disk[:device_id] = Regexp.last_match(2) when "PD Type" then disk[:interface] = Regexp.last_match(2) when "Raw Size" then disk[:size] = memory_to_disk_size(Regexp.last_match(2).sub(/\s*\[.*\]$/, "")) when "Inquiry Data" then disk[:vendor], disk[:model], disk[:serial_number] = Regexp.last_match(2).split @@ -588,6 +594,18 @@ Ohai.plugin(:Hardware) do controller[:device] = "/dev/#{File.basename(device)}" end end + + disks.each do |disk| + controller = devices[:controllers][disk[:controller]] + + if id = disk.delete(:device_id) + if device = Dir.glob("/sys/bus/pci/devices/#{controller[:pci_slot]}/host*/target0:0:#{id}/0:0:#{id}:0/block/sd*").first + disk[:device] = "/dev/#{File.basename(device)}" + else + disk[:smart_device] = "megaraid,#{id}" + end + end + end end def find_mpt1_disks(devices)