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.
pirms 10 gadiem
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
pirms 10 gadiem
Nitin Madhok
a8227385cc
Typo fix
Fixing typo
pirms 10 gadiem
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
pirms 10 gadiem
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
pirms 10 gadiem
Nitin Madhok
bb09803f90
Revert "Removed crypto dependency from salt.cloud."
pirms 10 gadiem
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.
pirms 10 gadiem
Tim O'Guin
cfa1f4eafc
fix syntax issues in package-map.jinja
pirms 10 gadiem
Tim O'Guin
a3c54f0e8f
added salt-ssh to package-map.jinja for most OS families
pirms 10 gadiem
Tim O'Guin
cde16097ed
add support for installing salt-ssh and managing the roster file, updated README and pillar.example
pirms 10 gadiem
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
pirms 10 gadiem
Tim O'Guin
3d52dfd8ec
added proper indentation for jinja conditionals in reactor template
pirms 10 gadiem
Tim O'Guin
2852e7b897
add templated file for reactor configuration and update pillar.example.
pirms 10 gadiem
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
pirms 10 gadiem
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.
pirms 10 gadiem
Andrew Vant
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
pirms 10 gadiem
Johannes
791025e065
Avoid config key clashes
Fixes #48
pirms 10 gadiem
Kevin Bowling
4675d68bd8
Initial FreeBSD support
pirms 10 gadiem
Kevin Bowling
b6d78a415d
Add FreeBSD to the package-map
pirms 10 gadiem
Johannes
247e6403a7
Add missing .conf to config files
Closes #45
pirms 10 gadiem
Love Nyberg
75a1f888eb
#12 Moved master and minion config file to .d
pirms 10 gadiem
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
pirms 10 gadiem
Wes Turner
bc7ccedf45
Fix nested file,pillar _roots in minion and master templates
See #37 "Fixed file_roots config generation with several environment"
pirms 10 gadiem
Love Nyberg
e798b46c8a
Added functionality to state for salt syndic deamon.
pirms 10 gadiem
Love Nyberg
85ce73a839
Added functionality to state for salt cloud and exampel for EC2 and GCE
pirms 10 gadiem
Shaun Carlson
9b730fc0c8
Fixed typo in autoreject_file setting
Fixed an apparent typo in the autoreject_file setting (which was listed as autorejecte_file)
pirms 10 gadiem
Oleg Tsarev
94da2654e2
Fixed file_roots config generation with several environment
pirms 10 gadiem
Chris McNabb
028412ee5e
use master when if in master
pirms 10 gadiem
Chris McNabb
d0392b576e
add Amazon os
pirms 10 gadiem
Oleg Tsarev
18d7471198
Supported Arch Linux
pirms 11 gadiem
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
pirms 11 gadiem
tiger-seo
507f2abc1a
possibility to define Halite configuration for salt-master
pirms 11 gadiem
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
pirms 11 gadiem
Kenneth Wilke
9404ebf915
Added module_config section to minion template
pirms 11 gadiem
Kenneth Wilke
e3a29bf69a
ext_pillar fix
pirms 11 gadiem
Kenneth Wilke
1f71bef33b
jijna syntax fix
pirms 11 gadiem
Kenneth Wilke
e104b3eb41
fixed ext_pillar
pirms 11 gadiem
Kenneth Wilke
426493b76d
fixed ext_pillar
pirms 11 gadiem
Justin Phelps
6282d9570c
Corrected the typo for the minion configuration file.
pirms 11 gadiem
Kenneth Wilke
c080cf37d6
ext_pillar fix
pirms 11 gadiem
Kenneth Wilke
e83d25b80f
newline fix
pirms 11 gadiem
Kenneth Wilke
98fd674c95
indentation fix
pirms 11 gadiem
Kenneth Wilke
92b2572734
newline fix
pirms 11 gadiem
Kenneth Wilke
153feac309
Edited master template
made fileserver_backend and gitfs_remotes look more like expected
pirms 11 gadiem
Kenneth Wilke
a14ded0b6e
really more gentoo
pirms 11 gadiem
Kenneth Wilke
5c3ffbd43c
added salt package mapping for gentoo
pirms 11 gadiem
Kenneth Wilke
48e2e326b2
fixed missing curly brackets
pirms 11 gadiem
Kenneth Wilke
fc9db5336a
added moar distro package mapping
pirms 11 gadiem
Kenneth Wilke
a6667cdb81
Isolated package mapping and some fixes
Moved package_table to it's own file, imported by sls files
Moved minion package under watch
Fixed some template mistakes I made
pirms 11 gadiem
Kenneth Wilke
2420b85913
overhauled minion template
pirms 11 gadiem