Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-07 03:28:55 +02:00
Code Issues Activity

Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge

Browse Source 
fix default dict warning with saltstack dev version
This commit is contained in:
Brian Jackson authored and GitHub committed 2017-01-21 11:41:49 -08:00
2 parents b4d55b80f9 caff23424d
commit cb050736b0
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/files/master.d/engine.conf
+1 -1
View File
@@ -1,7 +1,7 @@
# #
# This file is managed by Salt! Do not edit by hand! # This file is managed by Salt! Do not edit by hand!
# #
{%- set engines = salt['pillar.get']('salt:engines') -%} {%- set engines = salt['pillar.get']('salt:engines', {}) -%}
{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%} {%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
{%- if engines %} {%- if engines %}
engines: engines:
salt/files/minion.d/engine.conf
+1 -1
View File
@@ -1,7 +1,7 @@
# #
# This file is managed by Salt! Do not edit by hand! # This file is managed by Salt! Do not edit by hand!
# #
{%- set engines = salt['pillar.get']('salt:engines') -%} {%- set engines = salt['pillar.get']('salt:engines', {}) -%}
{%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%} {%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
{%- if engines %} {%- if engines %}
engines: engines: