Use file_client=remote for pillar when file_client=local but use_master_when_local is true#56612
Merged
dwoz merged 8 commits intosaltstack:masterfrom May 20, 2020
Merged
Conversation
ghost
requested a review
from …er_when_local is true
cro
force-pushed
the
minion-grains-cache-local
branch
from
83c44c5 to
ad9860d
Compare
dwoz
added
the
needs-testcase
xeacott
reviewed
May 5, 2020
Contributor
xeacott
left a comment
xeacott
left a comment
There was a problem hiding this comment.
Approving this just waiting on tests.
xeacott
changed the title
xeacott
added
Merge Ready
and removed
needs-testcase
xeacott
approved these changes
May 20, 2020
cmcmarrow
approved these changes
May 20, 2020
twangboy
approved these changes
May 20, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
When file_client is 'local' this makes the minion masterless
but sometimes we want the minion to read its files from the local
filesystem instead of asking for them from the master, but still
get commands from the master.
To enable this functionality set file_client=local and
use_master_when_local=True in the minion config. Then here we override
the file client to be 'remote' for getting pillar. If we don't do this
then the minion never sends the event that the master uses to update
its minion_data_cache. If the master doesn't update the minion_data_cache
then the SSE salt-master plugin won't see any grains for those minions.
What issues does this PR fix or reference?
#56611
Previous Behavior
Entries in the master's minion data cache for minions with file_client=local and use_master_when_local=True would be missing.
New Behavior
Minion data cache entries for these minions are correctly created.
Docs & changelog written?
Not yet.
Yes/No
Tests written?
Not yet
[NOTICE] Bug fixes or features added to Salt require tests.
Please review the test documentation for details on how to implement tests into Salt's test suite.
Yes/No
Commits signed with GPG?
Yes