Browse Source
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
fix default dict warning with saltstack dev versiontags/v0.57.0
Brian Jackson
8 years ago
2 changed files with 2 additions and 2 deletions
+ 1
- 1
salt/files/master.d/engine.conf
View File
| # | # | ||||
| # 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: |
+ 1
- 1
salt/files/minion.d/engine.conf
View File
| # | # | ||||
| # 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: |
Loading…