Heinz Wiesinger
549c73c739
Fix support for extra config values as mappings
преди 6 години
Matthew Richardson
aff75ce8ac
Handle other non-iterable values like int/float.
преди 6 години
Matthew Richardson
1a5027ef8c
Handle pillar params with child params. ( #372 )
преди 6 години
Matthew Richardson
c363aa9e04
Handle extra config where value is a list.
преди 6 години
ze42
2761d90626
minion: master_alive_interval: remove duplicate ( #369 )
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
преди 6 години
Justin Riley
d2ceaab7dd
only set master_alive_interval once ( #368 )
closes #367
преди 6 години
Felix Russell
9f33d2afe1
[Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update ( #359 )
* Minion/returner/elasticsearch yaml read fix.
* Improved the documentation for the elasticsearch returner
преди 6 години
Andrew Ernst
9ef5335f7b
Update f_defaults.conf to support elasticsearch returner ( #335 )
Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
преди 7 години
Elliot Chen
ec8241c6fd
Added minion scheduler configuration
преди 7 години
Javier Bértoli
b8273b9c3f
Fix lists join error ( #317 )
преди 7 години
Javier Bértoli
9331997269
Exclude reactors from f_defaults.conf
преди 7 години
Javier Bértoli
561eb4c5c8
Reactors should be in an array
преди 7 години
Javier Bértoli
442806ab9e
Allow to specify different reactors for minions and masters
преди 7 години
Javier Bértoli
edce95f949
Updated master and minion default config files
Added parameters new to 2016.03 (or simply missing in the existing config).
преди 7 години
Florian Ermisch
e86e6fc221
Work around missing `is mapping` on CentOS/RHEL 6
Checks for 'dict' in `x.__class__.__name__` b/c
neither `type()` nor `isinstance()` is available.
преди 7 години
Niels Abspoel
5ffed7de5c
fix beacons on dev
преди 7 години
Tobias Martin
fc40847542
fixed beacon variable name
преди 7 години
Tobias Martin
73906a03a5
added beacons configuration support
преди 7 години
Pavel Veretennikov
bad783ea28
Fixes jinja in include block
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
преди 7 години
Niels Abspoel
caff23424d
fix default dict
преди 7 години
Furlot
45e686b7f2
Add http proxy support for minion
преди 7 години
carpenti
3098aebcad
add engines as a reserved_keys to not add generic configuration
преди 8 години
carpenti
08d10376ab
implementing retro-compatible behavior
Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
преди 8 години
carpenti
c27bfd92b7
make the configuration of engines specific to master or minion
the engines are now configured using the following pillars:
* salt.master.engines
* salt.minion.engines
instead of a global salt.engines pillar.
Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
преди 8 години
Niels Abspoel
13a6ecf8b9
add missing files
преди 8 години
Matthew Richardson
89ece150e6
Tidy up comments, add some docs/examples.
преди 8 години
Matthew Richardson
5abdaee5a2
Handle config opts not part of default config.
преди 8 години
Rene Jochum
6ae81a9640
Add support for mongodb connection settings to config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
преди 8 години
Rene Jochum
478fef683b
Remove trailing whitespaces in config templates.
Signed-off-by: Rene Jochum <rene@jochums.at>
преди 8 години
Manoj Sonawane
98d591eab2
add module_config for minions
преди 8 години
Étienne BERSAC
adad72741e
Render config as JSON
преди 8 години
Brad Thurber
39479cafe9
add missing gitfs parms to minion config file as well (for use by standalone minions)
преди 8 години
a.genus
e97822a0d5
Take mine_functions back
преди 8 години
Niels Abspoel
a4c5b4f322
update 2015.8.7 version config for the minion
преди 8 години
Niels Abspoel
adb0c7008d
removing accidentally committed files
преди 9 години
Niels Abspoel
cbe5763668
fix pillar and libvirt
преди 9 години
Krzysztof Pawłowski
02be0b1367
add support for returner setting in minion configuration
преди 9 години
Devon Stewart
d730d4f2b8
Using cfg_salt['master'] is never the right answer
- When it's iterable, the minion could be running on the master
- When it's a string, there's no advantage over just specifying
`salt:minion:master`
преди 9 години
genus
4ff1a746d6
Add master_type option
преди 9 години
genus
a738198d8b
Add verify_master_pubkey_sign
преди 9 години
Javier Domingo
4344a1311b
Cleanup template for easier user reading
The user will already have it's /etc/salt/minion file, so it doesn't need all this info, and it makes easier to know what has been generated and what not
преди 9 години
Andrew Vant
11efee54c3
Added mine_functions to f_defaults.conf.
преди 9 години
Brian Jackson
7649c26a0d
Switch config file.recurse to clean by default and tell it to ignore _*
Salt writes it's schedule file to /etc/salt/{minion,master}.d/_schedule.conf
We don't want to stomp all over Salt's files, but we do want a pristine
starting point to lay down our managed config. So we use clean: True on the
file.recurse call, but we tell it to ignore files that start with an _
We have to rename the current config file (_defaults.conf) because it will be
ignored by the rule that ignores Salt's _* config files.
This also means we need to clean up old config files (_defaults.conf) and
restart the service if we cleaned it up.
преди 9 години
Niels Abspoel
90f23948ef
create config option for mine_interval
преди 9 години
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.
преди 9 години
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
преди 10 години
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.
преди 10 години
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.
преди 10 години
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.
преди 10 години
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.
преди 10 години