diff options
author | Tim Smith <tsmith84@gmail.com> | 2016-03-04 16:18:39 -0800 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2016-03-07 10:07:30 -0800 |
commit | 5cd3ebd08764243414e2baf5b4a56b7dfb2f6c68 (patch) | |
tree | 5d83702e1763136b56fe79a1370e12b91b460de5 | |
parent | 8862d88f46459ffa5a216ed867d14cbbca080c88 (diff) | |
download | ohai-5cd3ebd08764243414e2baf5b4a56b7dfb2f6c68.tar.gz |
Use the dmi_decode mixin to detect virtualization systems
This way anything we add for Linux will automatically get added to Solaris as well. We're already using this in *BSD as well. This will add Hyper-V, KVM, Xen, VirtualServer, VirtualBox, and Openstack detection. Not bad for a net reduction in code.
-rw-r--r-- | lib/ohai/plugins/solaris2/virtualization.rb | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/lib/ohai/plugins/solaris2/virtualization.rb b/lib/ohai/plugins/solaris2/virtualization.rb index 80cbfafc..2f3e96d3 100644 --- a/lib/ohai/plugins/solaris2/virtualization.rb +++ b/lib/ohai/plugins/solaris2/virtualization.rb @@ -18,6 +18,9 @@ # limitations under the License. # +require "ohai/mixin/dmi_decode" +include Ohai::Mixin::DmiDecode + Ohai.plugin(:Virtualization) do provides "virtualization" @@ -29,6 +32,7 @@ Ohai.plugin(:Virtualization) do collect_data(:solaris2) do virtualization Mash.new + virtualization[:systems] = Mash.new # Detect paravirt KVM/QEMU from cpuinfo, report as KVM psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" ) @@ -40,23 +44,15 @@ Ohai.plugin(:Virtualization) do end end - # http://www.dmo.ca/blog/detecting-virtualization-on-linux - smbios_path = Ohai.abs_path( "/usr/sbin/smbios" ) - if File.exists?(smbios_path) - so = shell_out(smbios_path) - case so.stdout - when /Manufacturer: Microsoft/ - if so.stdout =~ /Product: Virtual Machine/ - virtualization[:system] = "virtualpc" - virtualization[:role] = "guest" - end - when /Manufacturer: VMware/ - if so.stdout =~ /Product: VMware Virtual Platform/ - virtualization[:system] = "vmware" - virtualization[:role] = "guest" - end - else - nil + # Pass smbios information to the dmi_decode mixin to + # identify possible virtualization systems + smbios_path = Ohai.abs_path("/usr/sbin/smbios") + if File.exist?(smbios_path) + guest = guest_from_dmi(shell_out(smbios_path).stdout) + if guest + virtualization[:system] = guest + virtualization[:role] = "guest" + virtualization[:systems][guest.to_sym] = "guest" end end |