Only poll vmware attributes when on vmware #662
Merged
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
|
Tested on Azure and we no longer get a pile of empty attributes. Tested on vmware fusion with both the compiled vmware tools and the open tools available via apt and both do what you'd expect. |
| vmware[param] = from_cmd("#{vmtools_path} stat #{param}") | ||
| if vmware[param] =~ /UpdateInfo failed/ | ||
| vmware[param] = nil | ||
| if virtualization[:systems][:vmware] |
There was a problem hiding this comment.
You can avoid indenting the entirety of this method by pairing this check with the call to the method:
collect_data(:linux) do
get_vm_attributes("/usr/bin/vmware-toolbox-cmd") if virtualization[:systems][:vmware]
end
|
LGTM. (#662 (comment) is only a suggestion) |
This prevents an empty vmware hash with nil values being created on azure where the vmware tools are on the ubuntu image.
|
Much simpler. Rebased with that @mcquin |
|
Awesome. Looks good! |
|
👍 |
tas50
added a commit
that referenced
this pull request
Dec 8, 2015
Only poll vmware attributes when on vmware
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This will prevent Azure guests that contain the vmware toolbox CLI from being identified as vmware hosts. We shouldn't even try to grab vmware values unless dmidecode has identified the host as vmware. Added specs for when the CLI is missing and when we're not running on vmware.