fix(map): avoid defaults.merge bug on salt-ssh

* saltstack/salt#51605
saltstack-formulas · Mar 7, 2019 · 6c04031 · 6c04031
1 parent 1a64c23
commit 6c04031
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/redis/map.jinja b/redis/map.jinja
@@ -1,21 +1,19 @@
 # -*- coding: utf-8 -*-
 # vim: ft=jinja
 
-{% import_yaml 'redis/defaults.yaml' as defaults %}
-{% import_yaml 'redis/osfamilymap.yaml' as osfamilymap %}
-{% import_yaml 'redis/osfingermap.yaml' as osfingermap %}
+{#- Start imports as #}
+{%- import_yaml 'redis/defaults.yaml' as default_settings %}
+{%- import_yaml 'redis/osfamilymap.yaml' as osfamilymap %}
+{%- import_yaml 'redis/osfingermap.yaml' as osfingermap %}
 
-{# merge the osfamilymap #}
-{% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
-{% do salt['defaults.merge'](defaults['redis'], osfamily) %}
+{%- set defaults = salt['grains.filter_by'](default_settings,
+    default='redis',
+    merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
+      merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
+          merge=salt['pillar.get']('redis:lookup', default={})
+      )
+    )
+) %}
 
-{# merge the osfingermap #}
-{% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %}
-{% do salt['defaults.merge'](defaults['redis'], osfinger) %}
-
-{# merge the lookup #}
-{% set lookup = salt['pillar.get']('redis:lookup', default={}, merge=True) %}
-{% do salt['defaults.merge'](defaults['redis'], lookup) %}
-
-{# merge all #}
-{% set redis_settings = salt['pillar.get']('redis', default=defaults['redis'], merge=True) %}
+{#- Merge the redis pillar #}
+{%- set redis = salt['pillar.get']('redis', default=defaults, merge=True) %}