Skip to content

Commit

Permalink
Merge pull request #102 from myii/bug/fix-map-for-salt-ssh
Browse files Browse the repository at this point in the history
fix(`map.jinja`): use pillar/config `.get` according to `__cli` option
  • Loading branch information
alxwr authored May 15, 2019
2 parents 147760d + 00e474c commit 5311bd5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion template/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
) %}

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

0 comments on commit 5311bd5

Please sign in to comment.