num_cpus and cpu_model support for IBM/S390 #55510
Merged
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.
Added support for IBM/S390 in core.py
What does this PR do?
Correct # CPU grains output on S390x systems
What issues does this PR fix or reference?
Previous Behavior
salt-call grains.item num_cpus --out=pprint
{u'local': {u'num_cpus': 0}}
New Behavior
salt-call grains.item num_cpus --out=pprint
{u'local': {u'num_cpus': 2}}
Tests written?
No
Commits signed with GPG?
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.