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

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

Browse Source 
Revert "Add mine_functions to master config template"
This commit is contained in:
Nitin Madhok 2015-01-16 02:21:01 +05:30
commit f2131b05f3
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pillar.example
View File

@ -9,11 +9,6 @@ salt:
file_roots:
base:
- /srv/salt
mine_functions:
network.interfaces: []
network.ip_addrs: []
grains.items: []
minion:
master: salt
fileserver_backend:

17
salt/files/master.d/_defaults.conf
View File

@ -817,23 +817,6 @@ peer_run:
# web.*:
# - network.*
# - 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 #####