Skip to content

Set virtual grain when virtual_subtype exists#52672

Merged
dwoz merged 2 commits into
saltstack:2018.3from
waynew:51451-fix-docker-virtual-grain
Apr 25, 2019
Merged

Set virtual grain when virtual_subtype exists#52672
dwoz merged 2 commits into
saltstack:2018.3from
waynew:51451-fix-docker-virtual-grain

Conversation

@waynew
Copy link
Copy Markdown
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 April 24, 2019 13:02
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 April 24, 2019 18:03
@waynew waynew requested a review from a team April 24, 2019 21:36
@dwoz dwoz merged commit 3c05c9b into saltstack:2018.3 Apr 25, 2019
@Akm0d Akm0d mentioned this pull request Oct 17, 2019
@Akm0d Akm0d added the has master-port port to master has been created label Oct 18, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

has master-port port to master has been created

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants