Skip to content

Commit

Permalink
Merge pull request #114 from alxwr/master
Browse files Browse the repository at this point in the history
map.jinja: use tplroot
  • Loading branch information
myii authored May 15, 2019
2 parents f4c7226 + b9c5e03 commit c58fa7c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions template/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}

{%- set defaults = salt['grains.filter_by'](default_settings,
default='template',
default=tplroot,
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
merge=salt['grains.filter_by'](osmap, grain='os',
merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
merge=salt['config.get']('template:lookup', default={})
merge=salt['config.get'](tplroot ~ ':lookup', default={})
)
)
)
) %}

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

0 comments on commit c58fa7c

Please sign in to comment.