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
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.
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 лет назад
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
10 лет назад
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
10 лет назад
Nitin Madhok
00a9e0640c
Removing unnecessary -
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
10 лет назад
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.
10 лет назад
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.
10 лет назад
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
10 лет назад
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
10 лет назад
Tim O'Guin
3d52dfd8ec
added proper indentation for jinja conditionals in reactor template
10 лет назад
Tim O'Guin
2852e7b897
add templated file for reactor configuration and update pillar.example.
10 лет назад
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
10 лет назад
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.
10 лет назад