summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-03-16 12:30:02 -0700
committerTim Smith <tsmith@chef.io>2018-03-16 12:30:02 -0700
commit047d853307c9d2e2e92523cbc8e3f7daf5ab032d (patch)
tree19bb615ddfbb9d21ded99773845abfb036a66b83
parentca4b5959ba7adb3c00d540ad976cee7cffbe2a57 (diff)
downloadohai-047d853307c9d2e2e92523cbc8e3f7daf5ab032d.tar.gz
Use boot_rom_version to detect VMware guests on macOS
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/ohai/plugins/darwin/virtualization.rb2
-rw-r--r--spec/unit/plugins/darwin/virtualization_spec.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/ohai/plugins/darwin/virtualization.rb b/lib/ohai/plugins/darwin/virtualization.rb
index 35fa6187..2aaa17d5 100644
--- a/lib/ohai/plugins/darwin/virtualization.rb
+++ b/lib/ohai/plugins/darwin/virtualization.rb
@@ -70,7 +70,7 @@ Ohai.plugin(:Virtualization) do
virtualization[:systems][:vmware] = "host"
end
- if hardware[:machine_model].match?(/vmware/i)
+ if hardware[:boot_rom_version].match?(/VMW/i)
virtualization[:system] = "vmware"
virtualization[:role] = "guest"
virtualization[:systems][:vmware] = "guest"
diff --git a/spec/unit/plugins/darwin/virtualization_spec.rb b/spec/unit/plugins/darwin/virtualization_spec.rb
index f0944c01..7b9fef2a 100644
--- a/spec/unit/plugins/darwin/virtualization_spec.rb
+++ b/spec/unit/plugins/darwin/virtualization_spec.rb
@@ -32,7 +32,6 @@ describe Ohai::System, "Darwin virtualization platform" do
allow(plugin).to receive(:docker_exists?).and_return(false)
plugin[:hardware] = Mash.new
plugin[:hardware][:boot_rom_version] = "not_a_vm"
- plugin[:hardware][:machine_model] = "not_a_vm"
end
describe "when detecting OS X virtualization" do
@@ -58,7 +57,7 @@ describe Ohai::System, "Darwin virtualization platform" do
end
it "should set vmware guest if hardware attributes mention vmware" do
- plugin[:hardware][:machine_model] = "VMware"
+ plugin[:hardware][:boot_rom_version] = "VMW71.00V.6997262.B64.1710270607"
plugin.run
expect(plugin[:virtualization][:system]).to eq("vmware")
expect(plugin[:virtualization][:role]).to eq("guest")