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

Merge pull request #248 from aboe76/fix_osfinger

Browse Source 
Fix osfinger map.jinja
This commit is contained in:
Javier Bértoli 2018-11-08 19:33:07 -03:00 committed by GitHub
commit 17d3d84595
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apache/map.jinja
View File

@ -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) %}