Merge pull request #6 from AntoineCezar/dev

Add minion's include configurability
2013-07-22 08:01:38 -07:00 · 2013-07-22 08:01:38 -07:00 · 7d6ab1e4f1
parent 9a5e71bfd9 c7af1d12a1
commit 7d6ab1e4f1
1 changed files with 10 additions and 0 deletions
--- a/files/minion
+++ b/files/minion
@ -141,6 +141,16 @@ tcp_pull_port: {{ minion.get('tcp_pull_port', '4511') }}
 # include:
 #  - /etc/salt/extra_config
 #  - /etc/roles/webserver
+{% if minion['include'] is defined -%}
+    {% if isinstance(minion['include'], list) -%}
+        include:
+        {% for include in minion['include'] -%}
+            - {{ include }}
+        {% endfor -%}
+    {% else -%}
+        include: minion['include']
+    {% endif -%}
+{% endif -%}

 #####   Minion module management     #####
 ##########################################