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

Update regexes for Solaris 'product' grain and copy to 'productname' grain #47691

Merged
merged 6 commits into from May 25, 2018

Conversation

Projects
None yet
5 participants
@lomeroe
Contributor

lomeroe commented May 16, 2018

What does this PR do?

Updates the regexes for detecting the 'product' grain, additionally copies the data to 'productname' to be more consistent with other OSes.

What issues does this PR fix or reference?

#47690

Previous Behavior

Only the 'product' grain is set and in certain circumstances has incorrect data.

New Behavior

Both 'product' and 'productname' grians have data and accurate data should be displayed.

Tests written?

Yes

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.

lomeroe added some commits May 16, 2018

Update regexes in core grains for detecting the 'product' grain on
Solaris Sparc systems.  Additionally, copy the 'product' grain to
'productname' to be consistent with other OSes.

@cachedout cachedout requested review from meaksh and terminalmage May 18, 2018

@meaksh

meaksh approved these changes May 24, 2018

Looks goods 👍

@rallytime rallytime requested a review from dmurphy18 May 24, 2018

@dmurphy18

The code looks fine.

Note however in 2018.3.0 running salt-call --local grains.items does return productname in the grains output (Solaris 11.3 Intel using VirtualBox and Salt 2018.3.0)

productname:
    smbios: failed to load SMBIOS: No such file or directory

However I believe the issue with smbios failing as been address in the upcoming point release 2018.3.1, But this still will not address the original issue since smbios only works for the global zone.

@rallytime rallytime merged commit ffc2ebc into saltstack:2017.7 May 25, 2018

6 of 9 checks passed

default Build finished.
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #5282 — FAILURE
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #19338 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #25472 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #17558 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #23216 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #10253 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #22188 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment