saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
511 Commits 3 Branches 68 Tags 2 MiB
442806ab9e
Commit Graph

162 Commits

Author SHA1 Message Date
Javier Bértoli
442806ab9e Allow to specify different reactors for minions and masters 2017-05-22 19:20:36 -03:00
Heinz Wiesinger
68a2b72519 Fix rendering of external_auth config. 
This now properly also supports per user, per minion as well as
function argument limiting.
 2017-05-09 13:34:44 +02:00
Gilles Dartiguelongue
87074cf3d9 Do not sync salt-cloud provided default configuration by default 
As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
 2017-04-11 13:54:05 +02:00
Javier Bértoli
7093a32968 Simplify logic 2017-04-10 12:14:12 -03:00
Javier Bértoli
997194c992 Wrong list name in config file 2017-04-10 12:11:09 -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
Niels Abspoel
03ec0dce2d Merge pull request #301 from vquiering/move_to_publisher_acl 
Add new publisher_acl to salt master config
 2017-04-08 12:05:15 +02:00
Niels Abspoel
ca204ea8c4 Merge pull request #302 from vquiering/fix_external_auth_config 
add salt master config template external_auth settings
 2017-04-08 12:04:57 +02:00
Theo Chatzimichos
57498d1645
add syndic_user option in the master config 2017-04-07 12:12:21 +02:00
Vitali Quiering
f7189e2900 User publisher_acl setting in salt master config even if used client_acl in 
pillar (backwards compatibility)
 2017-03-27 08:39:05 +02:00
Vitali Quiering
894bd15c79 fix salt master config template to use external_auth settings 2017-03-25 19:59:16 +01:00
Vitali Quiering
d3b46a3648 add publisher_acl to salt master config 2017-03-24 13:07:19 +01: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
Florian Ermisch
5327e921fe Hack to make rendering work on CentOS 6 
!!   Not tested with an actual   !!
 !!  configured `ext_pillar` yet  !!

- jinja on RHEL/CentOS 6 has no 'mapping'
  test (see salt-formula issue #193)
- {% do ... %} allows no assignment, only
  function calls
- of course, `type(foo) is dict` doesn't
  work because it's no jinja test
- maybe `.isinstance()` would be nicer/more
  reliable
 2017-02-24 13:40:40 +01:00
risca
ef120e56bc fixed key reserved for lxc_profile file 2017-02-23 23:51:14 +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
Dafydd Jones
8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) 2016-12-01 21:30:12 +00:00
Forrest
01043740dc Merge pull request #259 from kakwa/separate_engines_config 
make the configuration of engines specific to master or minion
 2016-11-09 12:08:33 -08:00
Forrest
f6551c5fc8 Merge pull request #265 from genuss/pillar_opts 
Change default value for pillar_opts
 2016-11-09 10:01:41 -08:00
genuss
8fd8c76d5f Change default value for pillar_opts 2016-11-09 20:48:15 +03:00
Rob Ruma
6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id 2016-10-14 08:25:18 -04:00
Marcin Witowski
9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template 2016-10-07 00:48:59 +02: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
Jeremy T. Bouse
79fcda8806 Clean up formating of nodegroups 2016-09-04 15:00:03 +00:00
Jeremy T. Bouse
a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf 2016-09-04 14:47:39 +00:00
Krzysztof Pawłowski
776c5ecbe6 Add yaml_utf8 option to salt master configuration. 2016-08-24 13:06:24 +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
Matthew X. Economou
12390494cf Add support for s3fs 2016-07-09 08:29:33 -04: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
Raphaël Hertzog
182098fc16 JSON encode values embedded in the salt-master's configuration file 
This avoids problems when values are strings containing colons. And it
mimicks what was already done for the salt-minion's configuration file.

Fixes #233.
 2016-06-20 22:24:20 +02:00
risca
ca42d40ef9 added support for LXC profiles 2016-06-07 19:46:08 +02:00
Étienne BERSAC
adad72741e Render config as JSON 2016-05-29 20:43:45 +02:00
Christian McHugh
ac4ed62c03 Support engine configuration 2016-05-27 23:27:55 -05:00
Brad Thurber
b9ae603fd7 Add support for master eauth LDAP config 2016-05-26 10:52:10 -04:00