Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2024-12-25 09:16:09 +01:00
Code Issues Activity
581 Commits 3 Branches 69 Tags 2.4 MiB
784e2bc372
Commit Graph

58 Commits

Author SHA1 Message Date
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.
 2018-06-11 11:12:23 +02:00
Justin Riley
d2ceaab7dd only set master_alive_interval once (#368) 
closes #367
 2018-06-08 17:12:07 +02:00
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
 2018-04-17 22:26:45 +02:00
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
 2017-09-29 22:13:00 +02:00
Elliot Chen
ec8241c6fd Added minion scheduler configuration 2017-07-25 10:13:51 -04:00
Javier Bértoli
b8273b9c3f Fix lists join error (#317) 2017-06-09 08:34:55 -03:00
Javier Bértoli
9331997269 Exclude reactors from f_defaults.conf 2017-05-22 20:56:13 -03:00
Javier Bértoli
561eb4c5c8 Reactors should be in an array 2017-05-22 19:34:31 -03:00
Javier Bértoli
442806ab9e Allow to specify different reactors for minions and masters 2017-05-22 19:20:36 -03:00
Javier Bértoli
edce95f949 Updated master and minion default config files 
Added parameters new to 2016.03 (or simply missing in the existing config).
 2017-04-09 14:27:30 -03:00
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.
 2017-02-24 18:10:54 +01:00
Niels Abspoel
a26e82f530 Merge pull request #288 from aboe76/fix_beacons 
fix beacons on dev
 2017-02-01 22:53:44 +01:00
Niels Abspoel
c685ca7767 Merge pull request #277 from Furlot/patch-1 
Add http proxy support for minion
 2017-01-22 23:45:25 +01:00
Niels Abspoel
2e792584d2 Merge pull request #281 from vermut/patch-1 
Fixes jinja in include block
 2017-01-22 23:37:28 +01:00
Niels Abspoel
5ffed7de5c fix beacons on dev 2017-01-21 22:58:31 +01:00
Brian Jackson
cb050736b0 Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge 
fix default dict warning with saltstack dev version
 2017-01-21 11:41:49 -08:00
Tobias Martin
fc40847542
fixed beacon variable name 2017-01-13 15:26:17 +01:00
Tobias Martin
73906a03a5
added beacons configuration support 2017-01-13 14:22:39 +01:00
Pavel Veretennikov
bad783ea28 Fixes jinja in include block 
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
 2017-01-13 14:58:59 +02:00
Niels Abspoel
caff23424d fix default dict 2017-01-12 23:40:41 +01:00
Furlot
45e686b7f2 Add http proxy support for minion 2017-01-06 17:12:59 +01:00
carpenti
3098aebcad add engines as a reserved_keys to not add generic configuration 2016-10-05 22:28:33 +02:00
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.
 2016-10-05 21:14:00 +02:00
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)
 2016-10-05 10:26:36 +02:00
Niels Abspoel
13a6ecf8b9 add missing files 2016-09-30 22:00:11 +02:00
Matthew Richardson
89ece150e6 Tidy up comments, add some docs/examples. 2016-08-23 09:48:39 +01:00
Matthew Richardson
5abdaee5a2 Handle config opts not part of default config. 2016-08-22 11:22:08 +01:00
Rene Jochum
6ae81a9640 Add support for mongodb connection settings to config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 18:44:51 +02:00
Rene Jochum
478fef683b Remove trailing whitespaces in config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 16:22:16 +02:00
Forrest
137868bcc1 Merge pull request #237 from msonawane/master 
add module_config for minions
 2016-06-26 18:40:47 -07:00
Manoj Sonawane
98d591eab2 add module_config for minions 2016-06-27 01:34:05 +00:00
Étienne BERSAC
adad72741e Render config as JSON 2016-05-29 20:43:45 +02:00
Brad Thurber
39479cafe9 add missing gitfs parms to minion config file as well (for use by standalone minions) 2016-04-28 09:43:13 -04:00
a.genus
e97822a0d5 Take mine_functions back 2016-03-25 16:58:06 +03:00
Niels Abspoel
a4c5b4f322 update 2015.8.7 version config for the minion 2016-02-20 23:25:06 +01:00
Niels Abspoel
adb0c7008d removing accidentally committed files 2016-01-09 21:45:23 +01:00
Niels Abspoel
cbe5763668 fix pillar and libvirt 2016-01-09 19:39:47 +01:00
Krzysztof Pawłowski
02be0b1367 add support for returner setting in minion configuration 2015-12-21 15:00:35 +01:00
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`
 2015-11-15 12:11:20 -08:00
genus
4ff1a746d6 Add master_type option 2015-07-29 19:48:56 +03:00
genus
a738198d8b Add verify_master_pubkey_sign 2015-07-24 17:58:41 +03:00
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
 2015-05-08 22:33:43 +02:00
Andrew Vant
11efee54c3 Added mine_functions to f_defaults.conf. 2015-04-03 14:34:34 -04:00
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.
 2015-03-27 17:58:05 -05:00
Niels Abspoel
90f23948ef create config option for mine_interval 2015-02-20 20:43:14 +01:00
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