summaryrefslogtreecommitdiff
path: root/lib/ohai
diff options
context:
space:
mode:
authorBenjamin Black <bb@joyeuse-2.local>2009-01-30 16:36:19 -0800
committerBenjamin Black <bb@joyeuse-2.local>2009-01-30 16:36:19 -0800
commit9e54baf5e5546177133e40133d2c201bb032d6a1 (patch)
tree69d2b6be144163b7cd4721b0a38295b1079001d3 /lib/ohai
parent9af7502b12e0e6816b6365917bdd9d1bf4537a17 (diff)
downloadohai-9e54baf5e5546177133e40133d2c201bb032d6a1.tar.gz
[OHAI-36] remove extraneous level in virtualization storage mash
Diffstat (limited to 'lib/ohai')
-rw-r--r--lib/ohai/plugins/virtualization.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ohai/plugins/virtualization.rb b/lib/ohai/plugins/virtualization.rb
index b0a36f67..7e9a8b79 100644
--- a/lib/ohai/plugins/virtualization.rb
+++ b/lib/ohai/plugins/virtualization.rb
@@ -26,11 +26,11 @@ unless virtualization.nil? || !(virtualization[:role].eql?("host"))
virtualization[:nodeinfo] = virtconn.nodeinfo
virtualization[:domains] = virtconn.list_domains.collect {|d| virtconn.lookup_domain_by_id(d)}
virtualization[:networks] = virtconn.list_networks.collect {|n| virtconn.lookup_network_by_name(n)}
- virtualization[:storage] = Mash.new; virtualization[:storage][:pools] = Mash.new
+ virtualization[:storage] = Mash.new
virtconn.list_storage_pools.each do |pool|
- virtualization[:storage][:pools][pool] = Mash.new
- virtualization[:storage][:pools][pool][:info] = virtconn.lookup_storage_pool_by_name(pool).info
- virtualization[:storage][:pools][pool][:volumes] = virtconn.list_volumes.collect {|v| virtconn.list_volume_by_name(pool).info}
+ virtualization[:storage][pool] = Mash.new
+ virtualization[:storage][pool][:info] = virtconn.lookup_storage_pool_by_name(pool).info
+ virtualization[:storage][pool][:volumes] = virtconn.list_volumes.collect {|v| virtconn.list_volume_by_name(pool).info}
end
virtconn.close
end