(FACT-700) Detect KVM even when generic CPU Model Name is used. #774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We recently changed our VPS's CPU models from "QEMU Virtual CPU version 1.7.1" to "Westmere E56xx/L56xx/X56xx (Nehalem-C)". This led to facter errorenously detecting a physical environment rather than a virtualized one. This commit checks both pciconf and dmidecode for any signs of a virtualized. environment. KVM relies on bochs for emulating its BIOS. But if there's no virtio device and no telling CPU Model Name there is no way to distinct between plain Bochs and Bochs used together with KVM (at least not that I'm aware of). Therefore, I added an extra virtual type called 'bochs'. At least it will result either way in is_virtual=true.
|
CLA signed by all contributors. |
|
@kylog Is there anything we can do to move this PR forward? |
|
@Freeaqingme Thanks for the contribution! Would you be able to create a ticket in the Facter project within JIRA at https://jira.puppetlabs.com/browse/FACT so that we can properly track this issue? |
|
Minor: can you squash the commits? |
|
Jira issue is here: https://tickets.puppetlabs.com/browse/FACT-700 |
Freeaqingme
changed the title
|
Closing this in favor of #795 which simply squashes and cleans up white space. Thanks for the contribution! |
|
@Freeaqingme this was merged in 7d2520e and will be released in facter 2.3.0. Thanks for the contribution! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We recently changed our VPS's CPU models from "QEMU Virtual CPU version 1.7.1"
to "Westmere E56xx/L56xx/X56xx (Nehalem-C)". This led to facter
errorenously detecting a physical environment rather than a virtualized one.
This commit checks both pciconf and dmidecode for any signs of a virtualized.
environment. KVM relies on bochs for emulating its BIOS. But if there's no
virtio device and no telling CPU Model Name there is no way to distinct
between plain Bochs and Bochs used together with KVM (at least not that I'm
aware of). Therefore, I added an extra virtual type called 'bochs'. At least
it will result either way in is_virtual=true.
I'm not sure if I've ever signed a CLA. I do however consider this patch to be a trivial one.
Edit: Just signed a CLA