From 511b5d8d30e011ea556baf6565ae59058782d4af Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Mon, 10 Mar 2014 21:39:01 -0500 Subject: [PATCH 1/3] Add mine_functions section to minion config See http://docs.saltstack.com/topics/mine/ --- salt/files/minion | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/salt/files/minion b/salt/files/minion index d03f3d8d3..643e1c78e 100644 --- a/salt/files/minion +++ b/salt/files/minion @@ -614,3 +614,12 @@ pillar_roots: ############################################ # Location of the repository cache file on the master {{ get_config('win_repo_cachefile', 'salt://win/repo/winrepo.p') }} + +###### Salt Mine settings ###### +############################################ +{%- if 'mine_functions' in minion %} +mine_functions: +{%- for name, param in minion.mine_functions.items() %} + {{ name }}: {{ param }} +{%- endfor %} +{%- endif %} From e1e6a883a819d823a0d56d6e0ae7417a8a3803e5 Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Mon, 10 Mar 2014 22:21:55 -0500 Subject: [PATCH 2/3] Add mine_interval option to minion. --- salt/files/minion | 1 + 1 file changed, 1 insertion(+) diff --git a/salt/files/minion b/salt/files/minion index 643e1c78e..7b786ca7e 100644 --- a/salt/files/minion +++ b/salt/files/minion @@ -623,3 +623,4 @@ mine_functions: {{ name }}: {{ param }} {%- endfor %} {%- endif %} +{{ get_config('mine_interval', '2') }} From 829a139cf3b7a4cd229dcda7dd7ccbfc906e75ca Mon Sep 17 00:00:00 2001 From: Tyler Mandry Date: Tue, 11 Mar 2014 15:59:19 -0500 Subject: [PATCH 3/3] Allow more flexibility in setting mine function parameters --- salt/files/minion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/files/minion b/salt/files/minion index 7b786ca7e..1ae24b12c 100644 --- a/salt/files/minion +++ b/salt/files/minion @@ -620,7 +620,7 @@ pillar_roots: {%- if 'mine_functions' in minion %} mine_functions: {%- for name, param in minion.mine_functions.items() %} - {{ name }}: {{ param }} + {{ name }}: {{ param | yaml }} {%- endfor %} {%- endif %} {{ get_config('mine_interval', '2') }}