Add Amazon EC2 detection for virtual grains #62539
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
vzhestkov
force-pushed
the
add-grains-ec2-detection
branch
3 times, most recently
from
f7c5215 to
489f775
Compare
3 tasks
|
looks like there is a merge conflict |
|
@Ch3LL we found a couple more cases which is not covered with this solution. Will try to adjust tomorrow. |
vzhestkov
force-pushed
the
add-grains-ec2-detection
branch
from
8afbbf8 to
a568e95
Compare
Ch3LL
previously approved these changes
Sep 28, 2022
added 7 commits
September 29, 2022 18:16
possible in some specific environments
vzhestkov
force-pushed
the
add-grains-ec2-detection
branch
from
a568e95 to
f924eee
Compare
|
@Ch3LL I've added few more mocks to the test just because I found it's failing in some specific environments we are using internally for testing, haven't noticed it before. |
Ch3LL
approved these changes
Sep 29, 2022
3 tasks
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.
What does this PR do?
Adds
virtual_subtypeset toAmazon EC2in case if the it detects the instance running in Amazon EC2 environment.Previous Behavior
In case of running the minion in Amazon EC2 instance it's defined as xen or kvm, but no any information about Amazon EC2
New Behavior
Fills
virtual_subtypewithAmazon EC2orAmazon EC2 (PRODUCT)wherePRODUCTis the product name used forkvminstance. For examplem5.largeorm5.metal.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
Commits signed with GPG?
Yes/No
Please review Salt's Contributing Guide for best practices.
See GitHub's page on GPG signing for more information about signing commits with GPG.