Browse Source

Reactors should be in an array

master
Javier Bértoli 7 years ago
parent
commit
561eb4c5c8
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      salt/files/master.d/reactor.conf
  2. +1
    -1
      salt/files/minion.d/reactor.conf

+ 1
- 1
salt/files/master.d/reactor.conf View File

# 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) -%}



+ 1
- 1
salt/files/minion.d/reactor.conf View File

# 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) -%}



Loading…
Cancel
Save