Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-11-30 23:55:23 +01:00
Code Issues Activity

Fix lists join error (#317)

Browse Source
This commit is contained in:
Javier Bértoli 2017-06-09 08:34:55 -03:00
parent 83433c8dd8
commit b8273b9c3f
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! # This file is managed by Salt! Do not edit by hand!
# #
{# The parameter reactor is kept for backward compatibility -#} {# The parameter reactor is kept for backward compatibility -#}
{%- set reactors = salt['pillar.get']('salt:reactor', []) -%} {%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:master:reactors', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:master:reactors', default=reactors, merge=True) -%}
{%- if reactors %} {%- if reactors %}
reactor: 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! # This file is managed by Salt! Do not edit by hand!
# #
{# The parameter reactor is kept for backward compatibility -#} {# The parameter reactor is kept for backward compatibility -#}
{%- set reactors = salt['pillar.get']('salt:reactor', []) -%} {%- set reactors = salt['pillar.get']('salt:reactor', []) + salt['pillar.get']('salt:reactors', []) + salt['pillar.get']('salt:minion:reactors', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:minion:reactors', default=reactors, merge=True) -%}
{%- if reactors %} {%- if reactors %}
reactor: reactor: