diff options
| author | Tim Smith <tsmith@chef.io> | 2020-04-21 15:01:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 15:01:15 -0700 |
| commit | 707803a94718da5113ef70977a14da558c17f480 (patch) | |
| tree | cb9100721e39a35dc7df63f77507250cd11000b0 | |
| parent | b3fc37e939c2e2a8b49c8513e25d5ef00c63ad32 (diff) | |
| parent | 9df383d88dce60bbef31306bb398ce0be3687ef7 (diff) | |
| download | ohai-707803a94718da5113ef70977a14da558c17f480.tar.gz | |
Merge pull request #1453 from chef/openstack_15
Use correct DMI attribute name for product name to fix Openstack detection
| -rw-r--r-- | .rubocop.yml | 6 | ||||
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 4 | ||||
| -rw-r--r-- | spec/unit/plugins/linux/virtualization_spec.rb | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index 059ac238..5a772c5f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -6,11 +6,7 @@ AllCops: - "pkg/**/*" # these have shellout examples that need to have the tabs that come with the shellout -Layout/Tab: +Layout/IndentationStyle: Exclude: - "lib/ohai/plugins/mono.rb" - "lib/ohai/plugins/darwin/hardware.rb" - -# this can cause failures that we need to look at one by one -Performance/RegexpMatch: - Enabled: false diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index dd512ebb..1cb125aa 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -118,8 +118,8 @@ Ohai.plugin(:Virtualization) do # parse dmi to discover various virtualization guests # we do this *after* the kvm detection so that OpenStack isn't detected as KVM - logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product: '#{get_attribute(:dmi, :system, :product)}' version: '#{get_attribute(:dmi, :system, :version)}'") - guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version)) + logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product_name: '#{get_attribute(:dmi, :system, :product_name)}' version: '#{get_attribute(:dmi, :system, :version)}'") + guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product_name), get_attribute(:dmi, :system, :version)) if guest logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest") virtualization[:system] = guest diff --git a/spec/unit/plugins/linux/virtualization_spec.rb b/spec/unit/plugins/linux/virtualization_spec.rb index 468c5e0f..ccd868a4 100644 --- a/spec/unit/plugins/linux/virtualization_spec.rb +++ b/spec/unit/plugins/linux/virtualization_spec.rb @@ -190,7 +190,7 @@ describe Ohai::System, "Linux virtualization platform" do it "sets virtualization attributes if the appropriate DMI data is present" do plugin[:dmi] = { system: { manufacturer: "Amazon EC2", - product: "c5n.large", + product_name: "c5n.large", version: nil, }, } @@ -203,7 +203,7 @@ describe Ohai::System, "Linux virtualization platform" do it "sets empty virtualization attributes if nothing is detected" do plugin[:dmi] = { system: { manufacturer: "Supermicro", - product: "X10SLH-N6-ST031", + product_name: "X10SLH-N6-ST031", version: "0123456789", }, } |