Merge pull request #396 from myii/PR_fix-lookup-regression

Fix `salt:lookup` regression

Author: aboe76

salt/map.jinja

@@ -6,9 +6,6 @@
 {% import_yaml "salt/osfamilymap.yaml" as osfamilymap %}
 {% import_yaml "salt/osmap.yaml" as osmap %}
 
-{% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
-{% do defaults.salt.update(lookup) %}
-
 {# merge the osfamilymap #}
 {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
 {% do salt['defaults.merge'](defaults['salt'], osfamily) %}
@@ -17,6 +14,10 @@
 {% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %}
 {% do salt['defaults.merge'](defaults['salt'], osmap) %}
 
+{# merge the lookup #}
+{% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
+{% do salt['defaults.merge'](defaults['salt'], lookup) %}
+
 {## Merge in salt pillar ##}
 {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}