Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

implementing retro-compatible behavior 

Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
This commit is contained in:
carpenti 2016-10-05 21:14:00 +02:00
parent c27bfd92b7
commit 08d10376ab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/files/master.d/engine.conf
View File

@ -1,7 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set engines = salt['pillar.get']('salt:master:engines') -%}
{%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:master:engines', default=engines, merge=True) -%}
{%- if engines %}
engines:
{{ engines | yaml(False) | indent(2) }}

3
salt/files/minion.d/engine.conf
View File

@ -1,7 +1,8 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set engines = salt['pillar.get']('salt:minion:engines') -%}
{%- set engines = salt['pillar.get']('salt:engines') -%}
{%- set engines = salt['pillar.get']('salt:minion:engines', default=engines, merge=True) -%}
{%- if engines %}
engines:
{{ engines | yaml(False) | indent(2) }}