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

map.jinja: use tplroot #114

Merged
merged 1 commit into from
May 15, 2019
Merged

map.jinja: use tplroot #114

merged 1 commit into from
May 15, 2019

Conversation

alxwr
Copy link
Member

@alxwr alxwr commented May 15, 2019

When updating a formula the following should be sufficient:

cp template-formula/template/map.jinja my-formula/my/map.jinja
sed -i '/set template =/set my =/' my-formula/my/map.jinja

Tested with salt and salt-ssh on FreeBSD 11.2.

@myii I'm bringing back a useful change you introduced earlier.

@alxwr alxwr requested a review from myii May 15, 2019 16:06
@alxwr alxwr self-assigned this May 15, 2019
@myii
Copy link
Member

myii commented May 15, 2019

@alxwr salt-ssh clouded my mind! Thanks for bringing this back. I'll merge this as soon as the tests pass.

Follows on from #102.

When updating a formula the following should be sufficient:

```
cp template-formula/template/map.jinja my-formula/my/map.jinja
sed -i '/set template =/set my =/' my-formula/my/map.jinja
```

Based on the work of @myii!
@myii myii merged commit c58fa7c into saltstack-formulas:master May 15, 2019
@myii
Copy link
Member

myii commented May 15, 2019

Merged, thanks @alxwr.

@saltstack-formulas-travis

🎉 This PR is included in version 2.1.5 🎉

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
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants