diff --git a/pillar.example b/pillar.example index 5aacc2c93311bc8256852043007414257c8b43c3..abf2f8200ac155305f13252562c18c1e78b3d8c8 100644 --- a/pillar.example +++ b/pillar.example @@ -9,6 +9,11 @@ salt: file_roots: base: - /srv/salt + mine_functions: + network.interfaces: [] + network.ip_addrs: [] + grains.items: [] + minion: master: salt fileserver_backend: diff --git a/salt/files/master.d/_defaults.conf b/salt/files/master.d/_defaults.conf index 0f9e29750e014e9428b08f27e3f7c57c1e10a4b4..1c55d418d0ceb4ed44f6be4f6c0e185604c1a4d4 100644 --- a/salt/files/master.d/_defaults.conf +++ b/salt/files/master.d/_defaults.conf @@ -817,6 +817,23 @@ 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 #####