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

[2018.3] Fix to virtual core grain #50519

Conversation

Projects
None yet
4 participants
@garethgreenaway
Copy link
Member

commented Nov 15, 2018

What does this PR do?

Fixing a typo in the _virtual function, should be checking for existing grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particularly Oracle Linux.

What issues does this PR fix or reference?

#50266

Tests written?

Yes

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.

@garethgreenaway garethgreenaway requested a review from terminalmage Nov 15, 2018

@rallytime

This comment has been minimized.

Copy link
Contributor

commented Nov 15, 2018

@garethgreenaway there's a lint failure here. :)

garethgreenaway added some commits Nov 15, 2018

Fixing a typo in the _virtual function, should be checking for existi…
…ng grains in osdata not grains. Updating the detection to look for /sys/bus/xen/drivers/xenconsole instead of specifically looking for any files under /sys/bus/xen/drivers. Some systems that are not running as Xen PV hosts include files under that location, particular Oracle Linux.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:50266_core_virtual_grain_fixes branch from 9ca6de4 to 4f30611 Nov 15, 2018

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Nov 16, 2018

@garethgreenaway We hit a test failure here.

@garethgreenaway

This comment has been minimized.

Copy link
Member Author

commented Nov 16, 2018

@cachedout Seems unrelated to the change. The test in question ran fine in a follow up test run. I've seen those particular errors test runs on Windows before, have been unable to duplicate them, and then seen them clear up.

@garethgreenaway garethgreenaway merged commit 6fba83c into saltstack:2018.3 Nov 16, 2018

10 checks passed

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-centos-7 The py2-centos-7 job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 job has passed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 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
jenkins/pr/py3-windows-2016 The py3-windows-2016 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.