Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options #79
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
Most include do not expect salt to be something else than the usual salt variable giving access to all the salt modules. Instead we use cfg_salt. And for consistency we rename the master/minion variables to cfg_master/cfg_minion too.
This is only needed for salt versions older than 2014.7 that do not define the global "salt" variable in such context.
If those options are set in pillar data, the jinja template salt/files/master.d/_defaults.conf would fail to compile trying to evaluate non-existing variables. Replace those variables with the corresponding dictionnary entries.
gravyboat
added a commit
that referenced
this pull request
Dec 24, 2014
Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options
|
Good fix, thanks @rhertzog! |
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.
The first two commits should fix a regression for old salt versions (introduced with #76) due to the fact that the included salt/formulas.jinja will fail to compile complaining that the variable "salt" doesn't exist. This is fixed first by not shadowing the global salt variable in all the templates and then by adding an explicit "with context" so that jinja copies over the context.
The last commit fixes a bug with the way the event_return_whitelist/event_return_blacklist options were managed.