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
Seth House
02f8debea8
Merge pull request #72 from aboe76/update_config_2014.7
...
Updated master config file to 2014.7
2014-12-22 16:08:32 -07:00
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
2014-12-22 17:09:51 +01:00
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
2014-12-21 15:41:16 +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
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
2014-12-11 22:09:21 +01:00
Niels Abspoel
7da141721b
fix spacing with gitfs.
...
Updated gitfs jinja, to mirror master file
2014-12-09 23:22:06 +01:00
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
2014-12-08 22:17:07 +01:00
Niels Abspoel
a54d52a5bc
fix opensuse packaging
2014-12-08 21:13:29 +01:00
Niels Abspoel
27bf5324ee
added openSUSE support
2014-12-05 23:33:47 +01: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
570b45a9ef
Removing crypto pip dependency for complete RedHat family
2014-11-12 20:56:15 -05: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
Nitin Madhok
a8227385cc
Typo fix
...
Fixing typo
2014-11-06 14:23:52 -05:00
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
2014-11-06 14:11:19 -05:00
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
2014-11-06 13:33:53 -05:00
Nitin Madhok
bb09803f90
Revert "Removed crypto dependency from salt.cloud."
2014-11-05 14:59:26 -05:00
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.
2014-11-04 16:44:28 -05:00
Tim O'Guin
cfa1f4eafc
fix syntax issues in package-map.jinja
2014-10-28 11:50:23 -05:00
Tim O'Guin
a3c54f0e8f
added salt-ssh to package-map.jinja for most OS families
2014-10-28 11:46:38 -05:00
Tim O'Guin
cde16097ed
add support for installing salt-ssh and managing the roster file, updated README and pillar.example
2014-10-28 11:45:32 -05: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
Seth House
1682df8592
Merge remote-tracking branch 'origin/pr/47'
...
Conflicts:
salt/master.sls
salt/minion.sls
2014-10-09 16:39:07 -06: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
Andrew Vant
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
2014-10-03 21:23:50 -04:00
Johannes
791025e065
Avoid config key clashes
...
Fixes #48
2014-10-03 09:43:59 +01:00
Kevin Bowling
4675d68bd8
Initial FreeBSD support
2014-10-02 00:20:29 -07:00
Kevin Bowling
b6d78a415d
Add FreeBSD to the package-map
2014-10-01 23:54:30 -07:00
Johannes
247e6403a7
Add missing .conf to config files
...
Closes #45
2014-10-01 18:37:09 +01:00
Love Nyberg
75a1f888eb
#12 Moved master and minion config file to .d
2014-09-08 21:38:30 +02:00
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
2014-08-22 22:57:21 -05:00
Seth House
6c0cc53d5c
Merge pull request #42 from westurner/fix-nested-_roots
...
Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37 )
2014-07-23 11:45:29 -06:00
Love Nyberg
6405354299
Fixed merge conflict and rearaged readme.
2014-07-22 10:24:09 +02:00
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
...
See #37 "Fixed file_roots config generation with several environment"
2014-07-22 03:04:26 -05:00
Love Nyberg
e798b46c8a
Added functionality to state for salt syndic deamon.
2014-07-20 17:05:53 +02:00
Love Nyberg
85ce73a839
Added functionality to state for salt cloud and exampel for EC2 and GCE
2014-07-20 16:59:38 +02:00
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
...
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
2014-06-05 14:16:57 -06:00
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
2014-05-10 15:21:37 +02:00