saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

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

Browse Source 
Fix `salt:lookup` regression
This commit is contained in:
Niels Abspoel 2019-01-29 20:29:23 +01:00 committed by GitHub
commit 698085f758
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/map.jinja
View File

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