|
|
@@ -19,10 +19,6 @@ |
|
|
|
{% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %} |
|
|
|
{% 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 ##} |
|
|
|
{% 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) %} |