diff --git a/salt/files/master.d/reactor.conf b/salt/files/master.d/reactor.conf index 9c8a4b7..35e7e47 100644 --- a/salt/files/master.d/reactor.conf +++ b/salt/files/master.d/reactor.conf @@ -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: diff --git a/salt/files/minion.d/reactor.conf b/salt/files/minion.d/reactor.conf index d0f0a39..6f84abb 100644 --- a/salt/files/minion.d/reactor.conf +++ b/salt/files/minion.d/reactor.conf @@ -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: