Skip to content
Snippets Groups Projects
Unverified Commit 17d3d845 authored by Javier Bértoli's avatar Javier Bértoli Committed by GitHub
Browse files

Merge pull request #248 from aboe76/fix_osfinger

Fix osfinger map.jinja
parents c4154ba4 dcce3f61
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
{% do defaults.apache.update(oscode) %} {% do defaults.apache.update(oscode) %}
{# merge the osfingermap #} {# merge the osfingermap #}
{% set osfinger = salt['grains.filter_by'](osfingermap, grain='oscodename') or {} %} {% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %}
{% do defaults.apache.update(osfinger) %}
{# merge all #} {# merge all #}
{% set apache = salt['pillar.get']('apache', default=defaults['apache'], merge=true) %} {% set apache = salt['pillar.get']('apache', default=defaults['apache'], merge=true) %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment