saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases 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 2017-01-21 11:41:49 -08:00 committed by GitHub
commit cb050736b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/master.d/engine.conf
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:

2
salt/files/minion.d/engine.conf
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: