saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #116 from andrew-vant/mine_functions

Browse Source 
Added mine_functions to f_defaults.conf.
This commit is contained in:
Nitin Madhok 2015-04-03 15:52:02 -04:00
commit 1f43b96a00
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pillar.example
View File

@ -66,6 +66,15 @@ salt:
spam: sausage spam: sausage
cheese: bread cheese: bread
# salt mine setup
mine_interval: 60
# mine_functions can be set at the top level of the pillar, and
# that is preferable because it doesn't affect the conf file and
# doesn't require a minion restart. However, you can configure it
# here instead if you really want to.
mine_functions:
network.interface_ip: [eth0]
# salt cloud config # salt cloud config
cloud: cloud:
master: salt master: salt

7
salt/files/minion.d/f_defaults.conf
View File

@ -185,6 +185,13 @@ id: {{ cfg_minion['id'] }}
# The default interval is every 60 minutes. # The default interval is every 60 minutes.
{{ get_config('mine_interval', '60') }} {{ get_config('mine_interval', '60') }}
{%- 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) # To auto recover minions if master changes IP address (DDNS)
# auth_tries: 10 # auth_tries: 10
# auth_safemode: False # auth_safemode: False