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

Fix #50015, Windows grain defaults to physical as unix grain #50028

Merged
merged 2 commits into from Oct 16, 2018

Conversation

Projects
None yet
5 participants
@basseed
Copy link
Contributor

commented Oct 13, 2018

What does this PR do?

Changes Windows "virtual" grain to default to physical.

What issues does this PR fix or reference?

Issue #50015

Previous Behavior

No key for virtual is currently being returned and it causes errors if the grain is used in a multi-platform environment that includes windows.

New Behavior

The Windows "virtual" assumes phyisical unless a specific type of vm is detected, matching the unix grain behavior.

@gtmanfred gtmanfred requested a review from saltstack/team-windows Oct 15, 2018

@damon-atkins
Copy link
Member

left a comment

Seems a reasonable fix.

@rallytime rallytime requested review from twangboy and dwoz Oct 15, 2018

@cachedout cachedout merged commit e562838 into saltstack:2017.7 Oct 16, 2018

7 of 10 checks passed

jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has passed
Details
jenkins/pr/py3-ubuntu-1604 The py3-ubuntu-1604 job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.