Skip to content

Commit b9c5e03

Browse files
committed
fix(map.jinja): use tplroot
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!
1 parent f4c7226 commit b9c5e03

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

template/map.jinja

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
1111

1212
{%- set defaults = salt['grains.filter_by'](default_settings,
13-
default='template',
13+
default=tplroot,
1414
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
1515
merge=salt['grains.filter_by'](osmap, grain='os',
1616
merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
17-
merge=salt['config.get']('template:lookup', default={})
17+
merge=salt['config.get'](tplroot ~ ':lookup', default={})
1818
)
1919
)
2020
)
2121
) %}
2222

2323
{#- Merge the template config (e.g. from pillar) #}
24-
{%- set template = salt['config.get']('template', default=defaults) %}
24+
{%- set template = salt['config.get'](tplroot, default=defaults) %}

0 commit comments

Comments
 (0)