Merge pull request saltstack-formulas#212 from genuss/mine_functions

Take mine_functions back
1Q1 · Mar 25, 2016 · 59ee0c7 · 59ee0c7
2 parents 7856b5e + e97822a
commit 59ee0c7
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
@@ -204,6 +204,14 @@ id: {{ cfg_minion['id'] }}
 # Ping Master to ensure connection is alive (minutes).
 {{ get_config('ping_interval', '0') }}
 
+{%- if 'mine_functions' in cfg_minion %}
+mine_functions:
+{%- for func, args in cfg_minion['mine_functions'].items() %}
+  {{ func }}: {{ args }}
+{%- endfor %}
+{%- endif %}
+
+
 # To auto recover minions if master changes IP address (DDNS)
 #    auth_tries: 10
 #    auth_safemode: False