diff --git a/apache/map.jinja b/apache/map.jinja index 98e98f1f08888fdf01be0ff45c723ae7f6f7cc39..03143a092a6041be884df9b29dfd3e779c9c640b 100644 --- a/apache/map.jinja +++ b/apache/map.jinja @@ -22,7 +22,8 @@ {% do defaults.apache.update(oscode) %} {# 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 #} {% set apache = salt['pillar.get']('apache', default=defaults['apache'], merge=true) %}