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

fixes computenode_* grains on SmartOS compute nodes #34365

Merged
merged 1 commit into from
Jun 29, 2016
Merged

fixes computenode_* grains on SmartOS compute nodes #34365

merged 1 commit into from
Jun 29, 2016

Conversation

sjorge
Copy link
Contributor

@sjorge sjorge commented Jun 29, 2016

What does this PR do?

Fixes the computenode_* grains for SmartOS, somewhere before release they got broken.
I only noticed now because I try to consume them in the runner I am working on. Oops!

What issues does this PR fix or reference?

N/a

Previous Behavior

is_smartos is always true if is_smartos_global is true, so the section was never hit for inclusion.

New Behavior

Change elif to if, so now the grains do get added

Tests written?

No

Affected branches

  • 2016.3
  • develop

@cachedout cachedout merged commit 3808d84 into saltstack:2016.3 Jun 29, 2016
@cachedout
Copy link
Contributor

Nice! Thanks, @sjorge

@sjorge sjorge deleted the 2016.3-fix-broken-smartos-grains branch June 29, 2016 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants