Prefix configuration files with the suitable O/S-specific pathname #214
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
Without this change, importing map.jinja in config files (as opposed to SLS files) causes a rendering error because `slspath` isn't defined. The `salt_settings.key_url` variable gets used only in `salt/pkgrepo/debian/init.sls`.
|
Good catch, thanks! |
|
Thank you for merging this pull request! |
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.
Operating systems such as FreeBSD install the salt configuration files in locations other than
/etc/salt. The changes in this PR replace existing references to that location with theconfig_pathvariable, which gets overridden in map.jinja as appropriate.