saltstack-formulas/openssh-formula
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix map.jinja: openssh:lookup is not used anyways

Browse Source
This commit is contained in:
Alexander Weidinger 2019-02-12 19:01:34 +01:00
parent f53ccccd3f
commit 0c6a353969
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssh/map.jinja
View File

@ -19,10 +19,6 @@
{% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %} {% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %}
{% do salt['defaults.merge'](defaults, osfinger) %} {% do salt['defaults.merge'](defaults, osfinger) %}
{## merge the lookup ##}
{% set lookup = salt['pillar.get']('openssh:lookup', default={}, merge=True) %}
{% do salt['defaults.merge'](defaults['openssh'], lookup) %}
{## merge the openssh pillar ##} {## merge the openssh pillar ##}
{% set openssh = salt['pillar.get']('openssh', default=defaults['openssh'], merge=True) %} {% set openssh = salt['pillar.get']('openssh', default=defaults['openssh'], merge=True) %}
{% set ssh_config = salt['pillar.get']('ssh_config', default=defaults['ssh_config'], merge=True) %} {% set ssh_config = salt['pillar.get']('ssh_config', default=defaults['ssh_config'], merge=True) %}