Niels Abspoel
23fd8b64af
Fix #39 multi master support to minion
...
This will fix #39
And it will be backwards compatible with the current pillar configuration.
2015-02-06 22:27:55 +01:00
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
2014-12-27 00:00:48 +01:00
Raphaël Hertzog
d4ae38f825
Import the salt/formulas.jinja template with context
...
This is only needed for salt versions older than 2014.7 that do not
define the global "salt" variable in such context.
2014-12-24 16:19:43 +01:00
Raphaël Hertzog
445108f87a
Avoid “set salt” jinja calls that mask the usual salt variable
...
Most include do not expect salt to be something else than the usual salt
variable giving access to all the salt modules. Instead we use cfg_salt.
And for consistency we rename the master/minion variables to
cfg_master/cfg_minion too.
2014-12-24 16:12:40 +01:00
Wolodja Wentland
98917adad2
Merge pull request #77 from rhertzog/misc-bugfixes
...
FIxes for nodegroups/log_granular_levels settings and small cleanups
2014-12-24 08:52:29 +01:00
Raphaël Hertzog
8a828b506e
Use items() method instead of iteritems() for Python 3 compatibility
...
In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.
2014-12-23 17:42:43 +01:00
Raphaël Hertzog
f46b4f29d8
Add new “salt.formulas” state to manage salt formulas
...
This state downloads formulas from git repositories and ensures
that they are recorded in the file_roots setting.
2014-12-23 17:24:19 +01:00
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
2014-12-21 15:41:16 +01:00
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
...
better newlines with iterations.
2014-12-14 20:38:47 +01:00
Niels Abspoel
4b0ec5dc01
Improved jinja spacing in template
...
This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks
2014-12-11 22:09:21 +01:00
Niels Abspoel
7da141721b
fix spacing with gitfs.
...
Updated gitfs jinja, to mirror master file
2014-12-09 23:22:06 +01:00
Niels Abspoel
ef4bc1a25a
Added support for salt minion gitfs
...
Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate
2014-12-08 22:17:07 +01:00
Andrew Vant
00e245e20a
Added recursive management of minion.d and master.d.
...
This allows users to easily add configuration settings that the formula
doesn't yet provide, without having to modify the existing templates.
2014-10-06 11:56:07 -04:00
