Browse Source

Merge pull request #116 from andrew-vant/mine_functions

Added mine_functions to f_defaults.conf.
master
Nitin Madhok 9 years ago
parent
commit
1f43b96a00
2 changed files with 16 additions and 0 deletions
  1. +9
    -0
      pillar.example
  2. +7
    -0
      salt/files/minion.d/f_defaults.conf

+ 9
- 0
pillar.example View File

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
- 0
salt/files/minion.d/f_defaults.conf View File

# 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

Loading…
Cancel
Save