Fix lists join error (saltstack-formulas#317)

netmanagers · Jun 9, 2017 · b8273b9 · b8273b9
1 parent 83433c8
commit b8273b9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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: