Merge pull request #312 from netmanagers/master

Allow to specify reactors separatedly for master and minions

pillar.example

@@ -101,6 +101,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:
 
@@ -177,6 +184,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:
+      - 'minion/deploy':
+      - /srv/salt/reactors/deploy.sls
 
   # salt cloud config
   cloud:
@@ -235,9 +248,7 @@ salt:
       - IAD
       - SYD
       - HKG
-  reactor:
-    - 'deploy':
-      - /srv/salt/reactors/deploy.sls
+
   ssh_roster:
     prod1:
       host: host.example.com
@@ -255,6 +266,11 @@ salt:
         pub: |
           ...........
 
+  # These reactors will be configured both in the minion and the master
+  reactors:
+    - 'deploy':
+      - /srv/salt/reactors/deploy.sls
+
 salt_cloud_certs:
   aws:
     pem: |