diff options
| author | Tim Smith <tsmith84@gmail.com> | 2016-03-04 16:19:09 -0800 |
|---|---|---|
| committer | Tim Smith <tsmith84@gmail.com> | 2016-03-07 10:07:30 -0800 |
| commit | dece33cb1dcacab8d556f421fc68fbd1f38ed067 (patch) | |
| tree | c713f0f87288b78e1dd67d2b5a7e6840986b4536 /lib/ohai/plugins | |
| parent | 5cd3ebd08764243414e2baf5b4a56b7dfb2f6c68 (diff) | |
| download | ohai-dece33cb1dcacab8d556f421fc68fbd1f38ed067.tar.gz | |
Use the node[:virtualization][:systems] format everywhere
Diffstat (limited to 'lib/ohai/plugins')
| -rw-r--r-- | lib/ohai/plugins/solaris2/virtualization.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb index 2f3e96d3..7518cb41 100644 --- a/lib/ohai/plugins/solaris2/virtualization.rb +++ b/lib/ohai/plugins/solaris2/virtualization.rb @@ -41,6 +41,7 @@ Ohai.plugin(:Virtualization) do if so.stdout =~ /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/ virtualization[:system] = "kvm" virtualization[:role] = "guest" + virtualization[:systems][:kvm] = "guest" end end @@ -73,15 +74,17 @@ Ohai.plugin(:Virtualization) do if zones.length == 1 first_zone = zones.keys[0] - unless( first_zone == "global") + unless first_zone == "global" virtualization[:system] = "zone" virtualization[:role] = "guest" + virtualization[:systems][:zone] = "guest" virtualization[:guest_uuid] = zones[first_zone]["uuid"] virtualization[:guest_id] = collect_solaris_guestid end elsif zones.length > 1 virtualization[:system] = "zone" virtualization[:role] = "host" + virtualization[:systems][:zone] = "host" virtualization[:guests] = zones end end |
