Browse Source

Merge pull request #92 from saltstack-formulas/revert-91-master

Revert "Add mine_functions to master config template"
master
Nitin Madhok 10 years ago
parent
commit
f2131b05f3
2 changed files with 0 additions and 22 deletions
  1. +0
    -5
      pillar.example
  2. +0
    -17
      salt/files/master.d/_defaults.conf

+ 0
- 5
pillar.example View File

file_roots: file_roots:
base: base:
- /srv/salt - /srv/salt
mine_functions:
network.interfaces: []
network.ip_addrs: []
grains.items: []

minion: minion:
master: salt master: salt
fileserver_backend: fileserver_backend:

+ 0
- 17
salt/files/master.d/_defaults.conf View File

# web.*: # web.*:
# - network.* # - network.*
# - disk.* # - disk.*
{% if 'mine_functions' in cfg_master %}
mine_functions:
{% for name, roots in cfg_master['mine_functions'].items() %}
{{ name }}:
{% for mod in roots %}
- {{ mod }}
{% endfor %}
{% endfor %}
{% elif 'mine_functions' in cfg_salt %}
mine_functions:
{% for name, roots in cfg_salt['mine_functions'].items() %}
{{ name }}:
{% for mod in roots %}
- {{ mod }}
{% endfor %}
{% endfor %}
{% endif %}




##### Logging settings ##### ##### Logging settings #####

Loading…
Cancel
Save