浏览代码

make the configuration of engines specific to master or minion

the engines are now configured using the following pillars:

* salt.master.engines
* salt.minion.engines

instead of a global salt.engines pillar.

Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
tags/v0.57.0
carpenti 8 年前
父节点
当前提交
c27bfd92b7
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. +1
    -1
      salt/files/master.d/engine.conf
  2. +1
    -1
      salt/files/minion.d/engine.conf

+ 1
- 1
salt/files/master.d/engine.conf 查看文件

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

+ 1
- 1
salt/files/minion.d/engine.conf 查看文件

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

正在加载...
取消
保存