Resources: configurable pillar key; clear when key omitted#68922
Open
dwoz wants to merge 1 commit intosaltstack:resourcesfrom
Open
Resources: configurable pillar key; clear when key omitted#68922dwoz wants to merge 1 commit intosaltstack:resourcesfrom
dwoz wants to merge 1 commit intosaltstack:resourcesfrom
Conversation
Add minion option resource_pillar_key (default resources) with VALID_OPTS and DEFAULT_MINION_OPTS entries. Introduce salt.utils.resources helpers so discovery and ssh/dummy resource modules read the same pillar subtree. _discover_resources now uses pillar_resources_tree(), so a missing top-level pillar key clears opts['resources'] like an empty mapping, without preserving stale discovery output. Update unit tests for discovery behavior and add tests for the new helpers.
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
1 participant
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.
Add minion option resource_pillar_key (default resources) with VALID_OPTS and DEFAULT_MINION_OPTS entries. Introduce salt.utils.resources helpers so discovery and ssh/dummy resource modules read the same pillar subtree.
_discover_resources now uses pillar_resources_tree(), so a missing top-level pillar key clears opts['resources'] like an empty mapping, without preserving stale discovery output.
Update unit tests for discovery behavior and add tests for the new helpers.