2
0
Commit Graph

26 Commits

Author SHA1 Message Date
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
b8e53771f3 add mine_get function to master config 2015-02-19 21:59:44 +01:00
Niels Abspoel
7ddc1692ec added rest_tornado to _defaults.conf
see pillar.example for configuration
2015-02-06 18:46:32 +01:00
Nitin Madhok
fa6c39eccd Revert "Add mine_functions to master config template" 2015-01-16 02:20:43 +05:30
Jimmy Tang
deee69319f Add mine_functions to master config template 2015-01-15 16:15:38 +00:00
Tim O'Guin
b19c3acc77 merged with upstream 2015-01-06 13:10:59 -06:00
Raphaël Hertzog
7fb86b9076 Fix the handling of event_return_whitelist/event_return_blacklist
If those options are set in pillar data, the jinja template
salt/files/master.d/_defaults.conf would fail to compile trying to
evaluate non-existing variables.

Replace those variables with the corresponding dictionnary entries.
2014-12-24 16:25:51 +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
2f2cd972ac Use items() method to loop over nodegroups/log_granular_levels dictionaries
Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
2014-12-23 17:35:26 +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
Niels Abspoel
5029504212 Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
2014-12-19 23:18:08 +01:00
Niels Abspoel
af7f9d722a more improvements in _defaults.conf
better newlines with iterations.
2014-12-14 20:38:47 +01:00
Tim O'Guin
be972d9057 updated salt-master config template to add presence_events setting 2014-11-25 10:18:20 -06:00
Nitin Madhok
00a9e0640c Removing unnecessary -
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
2014-11-14 01:19:37 -05:00
Tiru Srikantha
70b5c981fa Test if individual gitfs remote is string
https://github.com/saltstack-formulas/salt-formula/issues/64

Fixes issue where a gitfs remote that has no child options would cause an
error. Also fix up bad yaml in pillar example.
2014-11-12 20:32:43 -08:00
Nitin Madhok
0f5f976433 Merge pull request #63 from sinnerschrader/feature/add_yaml_utf8_to_master_config
adds `yaml_utf8` option to master config
2014-11-09 10:12:37 -05:00
Marvin Frick
868854c2e7 enables use of jinja < 2.6
Commit 2b51a6f0c3 introduced options for gitfs_remotes in a pillar by using a jinja test to see if a parameter is a mapping (dict etc.). This feature however is only available in jinja 2.6 or newer (see http://jinja.pocoo.org/docs/dev/templates/#mapping).
Although this version of Jinja is available on Ubuntu, other OS / package managers do provide older versions (2.2.1 in RedHat 6).

This change makes use of the "iterable" test which should do the exact same thing.
2014-11-09 13:16:06 +01:00
Marvin Frick
8a187ac13f adds yaml_utf8 option to master config
Reference about this config value: http://docs.saltstack.com/en/latest/ref/configuration/master.html#yaml-utf8
Reference why this might be useful: https://github.com/saltstack/salt/issues/3436#issuecomment-61225863
2014-11-09 13:02:14 +01:00
Tim O'Guin
9fa42fe09d fixed YAML issue with templated reactor config 2014-10-28 10:55:18 -05:00
Tim O'Guin
3d52dfd8ec added proper indentation for jinja conditionals in reactor template 2014-10-24 17:04:12 -05:00
Tim O'Guin
2852e7b897 add templated file for reactor configuration and update pillar.example. 2014-10-24 14:48:56 -05:00
Ajna Cackovic
2b51a6f0c3 Allow repo options to be set per repo for gitfs_remotes in pillar 2014-10-23 18:32:47 -07: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