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.
10 years ago
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.
10 years ago
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.
10 years ago
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.
10 years ago
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 years ago
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 years ago
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 years ago
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
10 years ago
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
10 years ago
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
10 years ago
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
10 years ago
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
10 years ago
Niels Abspoel
7da141721b
fix spacing with gitfs.
Updated gitfs jinja, to mirror master file
10 years ago
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
10 years ago
Niels Abspoel
a54d52a5bc
fix opensuse packaging
10 years ago
Niels Abspoel
27bf5324ee
added openSUSE support
10 years ago
Nitin Madhok
00a9e0640c
Removing unnecessary -
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
10 years ago
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 years ago
Nitin Madhok
570b45a9ef
Removing crypto pip dependency for complete RedHat family
10 years ago
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 years ago
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 years ago
Nitin Madhok
a8227385cc
Typo fix
Fixing typo
10 years ago
Nitin Madhok
c6c8958aac
Removing crypto pip dependency for complete Debian family
Removing crypto pip dependency for the ``os_family`` ``Debian``.
Refer to PR:
https://github.com/saltstack-formulas/salt-formula/pull/60#issuecomment-62029457
10 years ago
Nitin Madhok
f84a0c4a9f
Removing crypto pip dependency for Ubuntu and Debian
Fixes:
https://github.com/saltstack-formulas/salt-formula/issues/59
Refer to PR:
https://github.com/saltstack-formulas/salt-formula/pull/60
10 years ago
Nitin Madhok
bb09803f90
Revert "Removed crypto dependency from salt.cloud."
10 years ago
Andrew Vant
5a6302e021
Removed crypto dependency from salt.cloud.
It doesn't seem to be available from pip anymore, and may not be
a real dependency. Salt-cloud certainly seems to work fine without
it.
10 years ago
Tim O'Guin
cfa1f4eafc
fix syntax issues in package-map.jinja
10 years ago
Tim O'Guin
a3c54f0e8f
added salt-ssh to package-map.jinja for most OS families
10 years ago
Tim O'Guin
cde16097ed
add support for installing salt-ssh and managing the roster file, updated README and pillar.example
10 years ago
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
10 years ago
Tim O'Guin
3d52dfd8ec
added proper indentation for jinja conditionals in reactor template
10 years ago
Tim O'Guin
2852e7b897
add templated file for reactor configuration and update pillar.example.
10 years ago
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
10 years ago
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 years ago
Andrew Vant
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
10 years ago
Johannes
791025e065
Avoid config key clashes
Fixes #48
10 years ago
Kevin Bowling
4675d68bd8
Initial FreeBSD support
10 years ago
Kevin Bowling
b6d78a415d
Add FreeBSD to the package-map
10 years ago
Johannes
247e6403a7
Add missing .conf to config files
Closes #45
10 years ago
Love Nyberg
75a1f888eb
#12 Moved master and minion config file to .d
10 years ago
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
10 years ago
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
10 years ago
Love Nyberg
e798b46c8a
Added functionality to state for salt syndic deamon.
10 years ago
Love Nyberg
85ce73a839
Added functionality to state for salt cloud and exampel for EC2 and GCE
10 years ago
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
10 years ago
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
10 years ago
Chris McNabb
028412ee5e
use master when if in master
10 years ago
Chris McNabb
d0392b576e
add Amazon os
10 years ago
Oleg Tsarev
18d7471198
Supported Arch Linux
10 years ago
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
10 years ago