From 561eb4c5c8deb149076ae16468320ea7c2ad0dd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= Date: Mon, 22 May 2017 19:34:31 -0300 Subject: [PATCH] Reactors should be in an array --- salt/files/master.d/reactor.conf | 2 +- salt/files/minion.d/reactor.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/files/master.d/reactor.conf b/salt/files/master.d/reactor.conf index 881a82cfc..9c8a4b7a7 100644 --- a/salt/files/master.d/reactor.conf +++ b/salt/files/master.d/reactor.conf @@ -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) -%} diff --git a/salt/files/minion.d/reactor.conf b/salt/files/minion.d/reactor.conf index 4022fdcad..d0f0a39f1 100644 --- a/salt/files/minion.d/reactor.conf +++ b/salt/files/minion.d/reactor.conf @@ -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) -%}