Salt/salt-formula
0
0 Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-10-24 07:49:07 +02:00
Code Issues Activity

Merge pull request #312 from netmanagers/master

Browse Source 
Allow to specify reactors separatedly for master and minions
This commit is contained in:
Niels Abspoel authored and GitHub committed 2017-06-03 19:28:05 +02:00
2 parents be266a180c 9331997269
commit 83433c8dd8
5 files changed
+31 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

salt/files/master.d/f_defaults.conf
+1 -1
View File
@@ -1,6 +1,6 @@
# This file managed by Salt, do not edit by hand!!
# Based on salt version 2016.11 default config
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'lxc.network_profile', 'lxc.container_profile'] -%}
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'lxc.network_profile', 'lxc.container_profile', 'reactors'] -%}
{% set cfg_salt = pillar.get('salt', {}) -%}
{% set cfg_master = cfg_salt.get('master', {}) -%}
{% set default_keys = [] -%}
salt/files/master.d/reactor.conf
+5 -1
View File
@@ -1,7 +1,11 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set reactors = salt['pillar.get']('salt:reactor') -%}
{# 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) -%}
{%- if reactors %}
reactor:
{%- for reactor in reactors %}
salt/files/minion.d/f_defaults.conf
+1 -1
View File
@@ -1,7 +1,7 @@
# This file managed by Salt, do not edit by hand!!
# Based on salt version 2016.11 default config
#
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons'] -%}
{% set reserved_keys = ['master', 'minion', 'cloud', 'salt_cloud_certs', 'engines', 'beacons', 'reactors'] -%}
{% set cfg_salt = pillar.get('salt', {}) -%}
{% set cfg_minion = cfg_salt.get('minion', {}) -%}
{% set default_keys = [] -%}
salt/files/minion.d/reactor.conf
+5 -1
View File
@@ -1,7 +1,11 @@
#
# This file is managed by Salt! Do not edit by hand!
#
{%- set reactors = salt['pillar.get']('salt:reactor') -%}
{# 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) -%}
{%- if reactors %}
reactor:
{%- for reactor in reactors %}