Niels Abspoel
90f23948ef
create config option for mine_interval
vor 9 Jahren
Niels Abspoel
b8e53771f3
add mine_get function to master config
vor 9 Jahren
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.
vor 9 Jahren
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
vor 9 Jahren
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
vor 9 Jahren
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
vor 10 Jahren
Jimmy Tang
deee69319f
Add mine_functions to master config template
vor 10 Jahren
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
vor 10 Jahren
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
vor 10 Jahren
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
vor 10 Jahren
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
vor 10 Jahren
Niels Abspoel
7da141721b
fix spacing with gitfs.
Updated gitfs jinja, to mirror master file
vor 10 Jahren
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
vor 10 Jahren
Tim O'Guin
be972d9057
updated salt-master config template to add presence_events setting
vor 10 Jahren
Nitin Madhok
00a9e0640c
Removing unnecessary -
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
vor 10 Jahren
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.
vor 10 Jahren
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.
vor 10 Jahren
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
vor 10 Jahren
Tim O'Guin
cde16097ed
add support for installing salt-ssh and managing the roster file, updated README and pillar.example
vor 10 Jahren
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
vor 10 Jahren
Tim O'Guin
3d52dfd8ec
added proper indentation for jinja conditionals in reactor template
vor 10 Jahren
Tim O'Guin
2852e7b897
add templated file for reactor configuration and update pillar.example.
vor 10 Jahren
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
vor 10 Jahren
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.
vor 10 Jahren
Andrew Vant
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
vor 10 Jahren
Johannes
791025e065
Avoid config key clashes
Fixes #48
vor 10 Jahren
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
vor 10 Jahren
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
vor 10 Jahren
Love Nyberg
85ce73a839
Added functionality to state for salt cloud and exampel for EC2 and GCE
vor 10 Jahren
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
vor 10 Jahren
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
vor 10 Jahren
Chris McNabb
028412ee5e
use master when if in master
vor 10 Jahren
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
vor 10 Jahren
tiger-seo
507f2abc1a
possibility to define Halite configuration for salt-master
vor 11 Jahren
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
vor 11 Jahren
Kenneth Wilke
9404ebf915
Added module_config section to minion template
vor 11 Jahren
Kenneth Wilke
e3a29bf69a
ext_pillar fix
vor 11 Jahren
Kenneth Wilke
1f71bef33b
jijna syntax fix
vor 11 Jahren
Kenneth Wilke
e104b3eb41
fixed ext_pillar
vor 11 Jahren
Kenneth Wilke
426493b76d
fixed ext_pillar
vor 11 Jahren
Justin Phelps
6282d9570c
Corrected the typo for the minion configuration file.
vor 11 Jahren
Kenneth Wilke
c080cf37d6
ext_pillar fix
vor 11 Jahren