Skip to content

Commit

Permalink
refactor(map): use config.get instead of pillar.get
Browse files Browse the repository at this point in the history
  • Loading branch information
myii committed Apr 24, 2019
1 parent 34d235a commit 5dc0b86
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 @@ -14,11 +14,11 @@
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['pillar.get']('template:lookup', default={})
merge=salt['config.get']('template:lookup', default={})
)
)
)
) %}

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

0 comments on commit 5dc0b86

Please sign in to comment.