From 442806ab9e7d8f28bb93f8b5c3c2f509b1ce1760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Mon, 22 May 2017 19:20:36 -0300
Subject: [PATCH] Allow to specify different reactors for minions and masters

---
 pillar.example                   | 22 +++++++++++++++++++---
 salt/files/master.d/reactor.conf |  4 ++++
 salt/files/minion.d/reactor.conf |  4 ++++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/pillar.example b/pillar.example
index 721bd3b..0cbf45e 100644
--- a/pillar.example
+++ b/pillar.example
@@ -95,6 +95,13 @@ salt:
             type: runner
             cmd: jobs.list_jobs
 
+    # optional: these reactors will be configured on the master
+    # They override reactors configured in
+    # 'salt:reactors' or the old 'salt:reactor' parameters
+    reactors:
+      - 'master/deploy':
+      - /srv/salt/reactors/deploy.sls
+
   # salt minion config:
   minion:
 
@@ -171,6 +178,12 @@ salt:
           - 1.0
         interval: 10
 
+    # Optional reactors: these reactors will be configured on the minion
+    # They override reactors configured in
+    # 'salt:reactors' or the old 'salt:reactor' parameters
+    reactors:
+      - 'master/deploy':
+      - /srv/salt/reactors/deploy.sls
 
   # salt cloud config
   cloud:
@@ -229,9 +242,7 @@ salt:
       - IAD
       - SYD
       - HKG
-  reactor:
-    - 'deploy':
-      - /srv/salt/reactors/deploy.sls
+
   ssh_roster:
     prod1:
       host: host.example.com
@@ -249,6 +260,11 @@ salt:
         pub: |
           ...........
 
+  # These reactors will be configured both to the minion and the master
+  reactors:
+    - 'deploy':
+      - /srv/salt/reactors/deploy.sls
+
 salt_cloud_certs:
   aws:
     pem: |
diff --git a/salt/files/master.d/reactor.conf b/salt/files/master.d/reactor.conf
index dd7fbb5..881a82c 100644
--- a/salt/files/master.d/reactor.conf
+++ b/salt/files/master.d/reactor.conf
@@ -1,7 +1,11 @@
 #
 # 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) -%}
+
 {%- if reactors %}
 reactor:
   {%- for reactor in reactors %}
diff --git a/salt/files/minion.d/reactor.conf b/salt/files/minion.d/reactor.conf
index dd7fbb5..4022fdc 100644
--- a/salt/files/minion.d/reactor.conf
+++ b/salt/files/minion.d/reactor.conf
@@ -1,7 +1,11 @@
 #
 # 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) -%}
+
 {%- if reactors %}
 reactor:
   {%- for reactor in reactors %}