fix(map.jinja): _merge_ defaults and config.get
#115
Merged
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
alxwr
force-pushed
the
fix-merge
branch
4 times, most recently
from
2f41ae0
to
f71ff87
Compare
|
@myii: fixed the merging, |
myii
approved these changes
May 15, 2019
|
Final solution for |
pillar.example
Outdated
|
|
||
| # Just for testing purposes | ||
| winner: pillar | ||
| added_in_pillar: asdf |
There was a problem hiding this comment.
Just to make it clear that is being pulled from the correct place, wouldn't it be better to have a different value than the one added_from_lookup ? ie, added_in_pillar: pillar_value?
There was a problem hiding this comment.
@javierbertoli I'll update the PR. Thanks for the feedback!
template/defaults.yaml
Outdated
| config: '/etc/template' | ||
| service: | ||
| name: template | ||
| # Just here for testing | ||
| added_in_defaults: asdf |
test resulting config
|
🎉 This PR is included in version 2.1.6 🎉 The release is available on GitHub release Your semantic-release bot 📦🚀 |
myii
added a commit
to myii/template-formula
that referenced
this pull request
May 27, 2019
* To distinguish between:
- `salt-minion`
- `salt-call`
- `salt-ssh`
* Invoked like `map.jinja`:
- `{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}`
* Based upon work done in PRs: saltstack-formulas#102, saltstack-formulas#114 & saltstack-formulas#115
myii
added a commit
to myii/template-formula
that referenced
this pull request
Mar 25, 2020
* To distinguish between:
- `salt-minion`
- `salt-call`
- `salt-ssh`
* Invoked like `map.jinja`:
- `{%- from tplroot ~ "/libsaltcli.jinja" import cli with context %}`
* Based upon work done in PRs: saltstack-formulas#102, saltstack-formulas#114 & saltstack-formulas#115
* Finalised from saltstack-formulas/libvirt-formula#71
* Required by saltstack-formulas#186
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 merge which was formerly done by
pillar.get(..., merge=True)has now to be performed bygrains.filter_by.Tested on FreeBSD with both
saltandsalt-ssh.