Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
pirms 9 gadiem
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
pirms 9 gadiem
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
saltify provider should set correct master
pirms 9 gadiem
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
pirms 9 gadiem
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
Revert "Add mine_functions to master config template"
pirms 9 gadiem
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
pirms 9 gadiem
Nitin Madhok
5cec66107a
Merge pull request #91 from qbcode/master
Add mine_functions to master config template
pirms 9 gadiem
Jimmy Tang
deee69319f
Add mine_functions to master config template
pirms 9 gadiem
Niels Abspoel
d071713fa7
update pillar.example for new lookup
pirms 10 gadiem
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
updated the map style without the base='default' parameter
pirms 10 gadiem
Wolodja Wentland
d3b920f5c7
Merge pull request #87 from aboe76/master
fix salt-ssh on Arch and Opensuse
pirms 10 gadiem
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
pirms 10 gadiem
Nitin Madhok
07b4fbd86a
Merge pull request #86 from smlloyd/master
Fix: pkgs is undefined
pirms 10 gadiem
Simon Lloyd
cb03e885d4
Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
pirms 10 gadiem
Nitin Madhok
9821a94104
Merge pull request #85 from aboe76/master
fix #84 with same logic as dnsmasq-formula
pirms 10 gadiem
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
pirms 10 gadiem
Seth House
77522d6e56
Merge pull request #81 from aboe76/use_lookup_map.jinja
Removed package_map lookup
pirms 10 gadiem
Niels Abspoel
4dc0044772
update use_lookup_map with merges from upstream
pirms 10 gadiem
Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
pirms 10 gadiem
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
Add support for presence_events setting in master config template
pirms 10 gadiem
Tim O'Guin
b19c3acc77
merged with upstream
pirms 10 gadiem
Niels Abspoel
896578a75a
Removed package_map lookup
Added map.jinja solution more in line with other formulas,
This also improves issue #30
and pull request #30
pirms 10 gadiem
Nitin Madhok
e8e01e34d9
Merge pull request #80 from aboe76/update_config_2014.7
updated minion _defaults.conf to version 2014.7
pirms 10 gadiem
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
pirms 10 gadiem
Forrest
77c0ecd729
Merge pull request #78 from qbcode/master
Add saltify provider, map and profile templates
pirms 10 gadiem
Forrest
c0af23f439
Merge pull request #79 from rhertzog/misc-bugfixes
Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options
pirms 10 gadiem
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.
pirms 10 gadiem
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.
pirms 10 gadiem
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.
pirms 10 gadiem
Jimmy Tang
b687659bff
Initial add of dummy saltify settings
This commit also provides a more concrete example of a 'host' to
be saltified. Users can do
salt-cloud -p make_salty someinstance
or
salt-cloud -m /etc/salt/cloud.maps.d/foo.conf
Either which way the online docs should really be updated with more
concrete examples.
pirms 10 gadiem
Wolodja Wentland
98917adad2
Merge pull request #77 from rhertzog/misc-bugfixes
FIxes for nodegroups/log_granular_levels settings and small cleanups
pirms 10 gadiem
Nitin Madhok
4bd82e79e9
Merge pull request #76 from rhertzog/formulas
Add new “salt.formulas” state to manage salt formulas
pirms 10 gadiem
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.
pirms 10 gadiem
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.
pirms 10 gadiem
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.
pirms 10 gadiem
Seth House
02f8debea8
Merge pull request #72 from aboe76/update_config_2014.7
Updated master config file to 2014.7
pirms 10 gadiem
Nitin Madhok
838386e0f1
Merge pull request #74 from rhertzog/standalone
Fix link and title in salt.standalone section of README.rst
pirms 10 gadiem
Nitin Madhok
d7c332724d
Merge pull request #75 from rhertzog/pkgrepo
Add new “salt.pkgrepo” state
pirms 10 gadiem
Raphaël Hertzog
41f85695b3
Fix link and title in salt.standalone section of README.rst
pirms 10 gadiem
Raphaël Hertzog
339adddfcc
Add new “salt.pkgrepo” state
This state enables the official saltstack package repository in order to
always benefit from the latest version. This state currently only works on
Debian and Ubuntu, and aims to implement the installation recommendations
of the official documentation:
http://docs.saltstack.com/en/latest/topics/installation/index.html
pirms 10 gadiem
Wolodja Wentland
c8c0781e8f
Merge pull request #73 from rhertzog/standalone
Add a “salt.standalone” state
pirms 10 gadiem
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
pirms 10 gadiem
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
pirms 10 gadiem
Nitin Madhok
b565c5f54c
Merge pull request #71 from aboe76/improve_config
more improvements in _defaults.conf
pirms 10 gadiem
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
pirms 10 gadiem
Seth House
0d8b10bb75
Merge pull request #70 from aboe76/fix_gitfs_spacing
fix spacing with gitfs.
pirms 10 gadiem
Niels Abspoel
4b0ec5dc01
Improved jinja spacing in template
This will make the _defaults.conf file for master and minion
better by removing some empty lines in some code blocks
pirms 10 gadiem
Niels Abspoel
7da141721b
fix spacing with gitfs.
Updated gitfs jinja, to mirror master file
pirms 10 gadiem
Nitin Madhok
8dbde0f1be
Merge pull request #68 from aboe76/minion_gitfs_support
Added support for salt minion gitfs
pirms 10 gadiem
Niels Abspoel
ef4bc1a25a
Added support for salt minion gitfs
Gitfs for the minion is possible with salt 2014.7
Updated config _defaults.conf and pillar with example
Tested it on Archlinux with salt-call --local state.highstate
pirms 10 gadiem