Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set virtual grain when virtual_subtype exists #52672

Merged
merged 2 commits into from Apr 25, 2019

Conversation

waynew
Copy link
Contributor

@waynew waynew commented Apr 23, 2019

What does this PR do?

What it says on the tin. If we have a virtual_subtype then we're running under some kind of virtualization. We should set something specific (e.g. container, if it's a lxc or docker (i.e. linux container)), but I don't think there's any reason we should let it be physical when there's a virtual_subtype

What issues does this PR fix or reference?

Fixes #51451

Previous Behavior

It was possible to have virtual = physical grain while virtual_subtype was set to something.

New Behavior

Now for Docker and LXC the virtual type will be Container. I don't know if there's a better, more specific term that we can use.

And if virtual_subtype is set, but the virtual grain is physical, just set it to the non-specific virtual.

Tests written?

Yes

Commits signed with GPG?

Yes

waynew added 2 commits Apr 24, 2019
Both Docker and LXC. Also, if we have a virtual_subtype then we're
virtual of *some* kind. Maybe we can't be specific, but we really
shouldn't be saying that we're *physical*
@waynew waynew force-pushed the 51451-fix-docker-virtual-grain branch from 5a163a9 to cdf1656 Compare Apr 24, 2019
@waynew waynew requested a review from Apr 24, 2019
dwoz
dwoz approved these changes Apr 25, 2019
@dwoz dwoz merged commit 3c05c9b into saltstack:2018.3 Apr 25, 2019
10 checks passed
@Akm0d Akm0d mentioned this pull request Oct 17, 2019
@Akm0d Akm0d added the has master-port label Oct 18, 2019
@waynew waynew added this to PR needs port to master in PRs to port to master Oct 24, 2019
@garethgreenaway garethgreenaway moved this from PR needs port to master to Failed: Skips, War room, CI Changes, Change already there in PRs to port to master Mar 25, 2020
@sagetherage sagetherage moved this from Failed: Skips, War room, CI Changes, Change already there, Not Needed to PR has port to master in PRs to port to master Apr 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
has master-port
Projects
PRs to port to master
  
PR has port to master
Development

Successfully merging this pull request may close these issues.

None yet

3 participants