Skip to content

Commit

Permalink
Reactors should be in an array
Browse files Browse the repository at this point in the history
  • Loading branch information
javierbertoli committed May 22, 2017
1 parent 442806a commit 561eb4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion salt/files/master.d/reactor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +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:reactor', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:master:reactors', default=reactors, merge=True) -%}

Expand Down
2 changes: 1 addition & 1 deletion salt/files/minion.d/reactor.conf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +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:reactor', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%}
{%- set reactors = salt['pillar.get']('salt:minion:reactors', default=reactors, merge=True) -%}

Expand Down

0 comments on commit 561eb4c

Please sign in to comment.