saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #318 from netmanagers/master

Browse Source 
Fix lists join error (#317)
This commit is contained in:
Niels Abspoel 2017-06-09 22:42:51 +02:00 committed by GitHub
commit 826bf6695e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/files/master.d/reactor.conf
View File

@ -2,9 +2,7 @@
# This file is managed by Salt! Do not edit by hand!
#
{# The parameter reactor is kept for backward compatibility -#}
{%- set reactors = salt['pillar.get']('salt:reactor', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:master:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:master:reactors', []) -%}
{%- if reactors %}
reactor:

4
salt/files/minion.d/reactor.conf
View File

@ -2,9 +2,7 @@
# This file is managed by Salt! Do not edit by hand!
#
{# The parameter reactor is kept for backward compatibility -#}
{%- set reactors = salt['pillar.get']('salt:reactor', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:minion:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:minion:reactors', []) -%}
{%- if reactors %}
reactor: