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] reset file_roots for renderers after compile_pillar #48389

Merged
merged 4 commits into from Jul 11, 2018

Conversation

Projects
None yet
5 participants
@garethgreenaway
Member

garethgreenaway commented Jun 29, 2018

What does this PR do?

When pillar items are compiled a new render is instantiated but the file_roots is the pillar_roots. This change forces the opts['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.

What issues does this PR fix or reference?

#48277
#46986

Tests written?

Yes

Commits signed with GPG?

Yes

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 Jun 29, 2018

@garethgreenaway garethgreenaway requested a review from saltstack/team-core as a code owner Jun 29, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Jun 29, 2018

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:48277_2018_3_file_roots_wrong branch from d39bcd9 to 61f5fb1 Jun 30, 2018

@isbm

@garethgreenaway please incorporate the review from #48388 (review)

garethgreenaway added some commits Jun 29, 2018

When pillar items are compiled a new render is instantiated but the f…
…ile_roots is the pillar_roots. This change forces the __opts__['file_roots'] to be set to what is set in actual_file_roots for all renderers once compile_pillar has finished. Adding a test when this situation is run via a orchestration runner.

@garethgreenaway garethgreenaway force-pushed the garethgreenaway:48277_2018_3_file_roots_wrong branch from f8f3f9a to 4b492fa Jul 2, 2018

@rallytime rallytime merged commit 5a0b274 into saltstack:2018.3 Jul 11, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20245 — ABORTED
Details
default Build finished.
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11162 — FAILURE
Details
WIP ready for review
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26403 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18440 — SUCCESS
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6192 — SUCCESS
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24120 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23075 — SUCCESS
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment