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

Warn about proper validation option #51278

Merged
merged 3 commits into from Jan 22, 2019

Conversation

Projects
None yet
3 participants
@dwoz
Copy link
Contributor

commented Jan 22, 2019

What does this PR do?

When normalizing pillar_roots if the option is not a dictionary, warn about pillar_roots and fallback to its default.

What issues does this PR fix or reference?

#51248

Previous Behavior

When validating pillar_roots we warned about file_roots and used the file_roots fallback.

New Behavior

Warn about the proper option and use proper fallback for pillar_roots

Tests written?

Yes

Commits signed with GPG?

Yes

Fix wart in pillar_roots validation
Adds tests for pillar and file roots validation

@dwoz dwoz requested a review from saltstack/team-core as a code owner Jan 22, 2019

@waynew

waynew approved these changes Jan 22, 2019

Copy link
Contributor

left a comment

👍

@dwoz dwoz force-pushed the dwoz:issue51248 branch from f2ef050 to c614198 Jan 22, 2019

@thatch45 thatch45 merged commit 1abffb2 into saltstack:2018.3.4 Jan 22, 2019

9 checks passed

continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint Python lint test 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.