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

Ensure config module loads opts from the named_context. #61732

Merged

Conversation

garethgreenaway
Copy link
Contributor

@garethgreenaway garethgreenaway commented Feb 27, 2022

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 the config module during initialization as part of configuring beacons. This would result in incorrect values being returned by the config 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.

@garethgreenaway garethgreenaway requested a review from a team as a code owner February 27, 2022 17:51
@garethgreenaway garethgreenaway requested review from waynew and removed request for a team February 27, 2022 17:51
@garethgreenaway
Copy link
Contributor Author

run full-all

@garethgreenaway
Copy link
Contributor Author

re-run full all

@garethgreenaway 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
@garethgreenaway garethgreenaway added this to the Phosphorus v3005.0 milestone Mar 2, 2022
@s0undt3ch s0undt3ch requested a review from dwoz March 2, 2022 21:06
Copy link
Contributor

@Ch3LL Ch3LL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changelog

@garethgreenaway garethgreenaway requested a review from Ch3LL March 3, 2022 22:55
Ch3LL
Ch3LL previously approved these changes Mar 7, 2022
Copy link
Contributor

@Ch3LL Ch3LL left a 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.

@Ch3LL Ch3LL added the Phosphorus v3005.0 Release code name and version label Mar 7, 2022
@Ch3LL Ch3LL merged commit 43fd0ab into saltstack:master Mar 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Phosphorus v3005.0 Release code name and version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deltaproxy overriding minion configuration settings
3 participants