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

Make Pillar no longer munge file_roots #49987

Merged
merged 2 commits into from Oct 15, 2018

Conversation

Projects
None yet
4 participants
@terminalmage
Copy link
Contributor

commented Oct 10, 2018

Pillar and the local fileclient used to use the same class, but this changed a few years ago with the introduction of FSClient (which enabled non-roots fileserver backends in masterless Salt). Since Pillar is the only thing that uses this client, there is no longer a reason to make Pillar modify file_roots.

Fixes #47539

Make Pillar no longer munge file_roots
Pillar and the local fileclient used to use the same class, but this
changed a few years ago with the introduction of FSClient (which enabled
non-roots fileserver backends in masterless Salt). Since Pillar is the
only thing that uses this client, there is no longer a reason to make
Pillar modify file_roots.

@terminalmage terminalmage requested a review from saltstack/team-core as a code owner Oct 10, 2018

@salt-jenkins salt-jenkins requested a review from saltstack/team-suse Oct 10, 2018

@gtmanfred
Copy link
Contributor

left a comment

Confirmed fixes #47539

@cachedout

This comment has been minimized.

Copy link
Collaborator

commented Oct 11, 2018

@terminalmage Test fixups needed.

@terminalmage

This comment has been minimized.

Copy link
Contributor Author

commented Oct 15, 2018

Tests should be fixed with latest commit.

@gtmanfred gtmanfred merged commit 4c4bb5a into saltstack:2018.3 Oct 15, 2018

6 of 10 checks passed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details
jenkins/pr/py2-centos-7 The py2-centos-7 job has failed
Details
jenkins/pr/py2-windows-2016 The py2-windows-2016 job has failed
Details
jenkins/pr/py3-windows-2016 The py3-windows-2016 job has failed
Details
WIP ready for review
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
jenkins/pr/py2-ubuntu-1604 The py2-ubuntu-1604 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

@terminalmage terminalmage deleted the terminalmage:pillar_roots branch Oct 16, 2018

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.