fix: change defaults.merge into slsutil.merge because it not support …

…for salt-ssh, detail: saltstack/salt#51605
vincentor · Apr 28, 2020 · 4b49433 · 4b49433
1 parent bc5e0ec
commit 4b49433
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/salt/map.jinja b/salt/map.jinja
@@ -8,15 +8,15 @@
 
 {# merge the osfamilymap #}
 {% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
-{% do salt['defaults.merge'](defaults['salt'], osfamily) %}
+{% do salt['slsutil.merge'](defaults['salt'], osfamily) %}
 
 {# merge the osmap #}
 {% set osmap = salt['grains.filter_by'](osmap, grain='os') or{} %}
-{% do salt['defaults.merge'](defaults['salt'], osmap) %}
+{% do salt['slsutil.merge'](defaults['salt'], osmap) %}
 
 {# merge the lookup #}
 {% set lookup = salt['pillar.get']('salt:lookup', default={}, merge=True) %}
-{% do salt['defaults.merge'](defaults['salt'], lookup) %}
+{% do salt['slsutil.merge'](defaults['salt'], lookup) %}
 
 {#- Merge in salt pillar #}
 {% set salt_settings = salt['pillar.get']('salt', default=defaults['salt'], merge=True) %}