saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Reactors should be in an array

Browse Source
This commit is contained in:
Javier Bértoli 2017-05-22 19:34:31 -03:00
parent 442806ab9e
commit 561eb4c5c8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/files/master.d/reactor.conf
View File

@ -2,7 +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', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%} {%- 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:master:reactors', default=reactors, merge=True) -%}

2
salt/files/minion.d/reactor.conf
View File

@ -2,7 +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', []) -%}
{%- set reactors = salt['pillar.get']('salt:reactors', default=reactors, merge=True) -%} {%- 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:minion:reactors', default=reactors, merge=True) -%}