-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Ensure config module loads opts from the named_context. #61732
Merged
Ch3LL
merged 5 commits into
saltstack:master
from
garethgreenaway:61297_deltaproxy_overriding_config
Mar 8, 2022
Merged
Ensure config module loads opts from the named_context. #61732
Ch3LL
merged 5 commits into
saltstack:master
from
garethgreenaway:61297_deltaproxy_overriding_config
Mar 8, 2022
Conversation
This file contains 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
… from the named_context.
run full-all |
re-run full all |
…oxy controlled proxy minions that the correct values are returned
garethgreenaway
changed the title
[WIP] Ensure config module loads opts from the named_context.
Ensure config module loads opts from the named_context.
Mar 2, 2022
Ch3LL
suggested changes
Mar 3, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changelog
Ch3LL
previously approved these changes
Mar 7, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Approve, but want to make sure @dwoz approves too on this one.
dwoz
requested changes
Mar 8, 2022
dwoz
approved these changes
Mar 8, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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?
Ensure opts is included in pack for minion_mods and config loads opts from the named_context.
What issues does this PR fix or reference?
Fixes: #61297
Previous Behavior
When used with deltaproxy, the config module would use the
__opts__
from the last sub proxy minion that used theconfig
module during initialization as part of configuring beacons. This would result in incorrect values being returned by theconfig
module.New Behavior
Load
__opts__
from the Salt loader's named_context to ensure we're using the__opts__
for the correct minion.Merge requirements satisfied?
[NOTICE] Bug fixes or features added to Salt require tests.
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.