From feb09698ce05137397c8c7ed157718f11a4480a7 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Tue, 29 Jan 2019 01:56:49 +0000 Subject: [PATCH] Fix `salt:lookup` regression --- salt/map.jinja | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/salt/map.jinja b/salt/map.jinja index 6b9756a..8c433b2 100644 --- a/salt/map.jinja +++ b/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) %}