Nitin Madhok
3b892e47cc
Merge pull request #62 from sinnerschrader/fix/support_jinja_lt_2_6
enables use of jinja < 2.6
pirms 10 gadiem
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
5f967781bc
Merge pull request #61 from saltstack-formulas/revert-60-cryptodep
Revert "Removed crypto dependency from salt.cloud."
pirms 10 gadiem
Nitin Madhok
bb09803f90
Revert "Removed crypto dependency from salt.cloud."
pirms 10 gadiem
Nitin Madhok
b0284ad590
Merge pull request #60 from andrew-vant/cryptodep
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
Nitin Madhok
8100753f71
Merge pull request #58 from juiceinc/ssh-roster
Add salt.ssh state for installing and configuring salt-ssh
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
Nitin Madhok
4e32c5e6ee
Merge pull request #57 from juiceinc/master
Fix YAML issue with templated reactor config
pirms 10 gadiem
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
pirms 10 gadiem
Nitin Madhok
69b2ee3812
Merge pull request #56 from juiceinc/master
add templated file for reactor configuration and update pillar.example.
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
Nitin Madhok
3e4d9d012b
Merge pull request #55 from OneID/feature/gitfs-repo-options
Allow individual repo options for gitfs_remotes
pirms 10 gadiem
Ajna Cackovic
9dab2f9dab
Update pillar.example to show gitfs_remotes option usage
pirms 10 gadiem
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
pirms 10 gadiem
Nitin Madhok
2013d4b499
Merge pull request #53 from ZetaBit/vagrant
Vagrant
pirms 10 gadiem
Martin Griesbach
ca4a58ec1a
Added a basic description of Vagrant usage.
pirms 10 gadiem
Martin Griesbach
0c0b1745a8
Vagrant: increased wait to ensure the minion sent it's key to the master before Accepting all keys.
pirms 10 gadiem
Martin Griesbach
862421e80f
Added a Vagrant setup to instantly test the formula
pirms 10 gadiem
Seth House
1682df8592
Merge remote-tracking branch 'origin/pr/47'
Conflicts:
salt/master.sls
salt/minion.sls
pirms 10 gadiem
Nitin Madhok
51e493e448
Merge pull request #52 from andrew-vant/salt.d.doc
Readme note about user-provided configuration templates.
pirms 10 gadiem
Andrew Vant
013736e2ca
Readme note about user-provided configuration templates.
pirms 10 gadiem
Forrest
05087a8d42
Merge pull request #51 from andrew-vant/salt.d
Added recursive management of minion.d and master.d.
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
Forrest
095c6a8e4b
Merge pull request #50 from andrew-vant/rsprov
Added salt-cloud support for Rackspace OpenStack servers.
pirms 10 gadiem
Andrew Vant
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
pirms 10 gadiem
Forrest
4702e77756
Merge pull request #49 from johtso/issue-48
Avoid config key clashes
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
Kevin Bowling
8c10d8c776
Pillar example whitespace
pirms 10 gadiem
Nitin Madhok
e237a7dbbb
Merge pull request #46 from johtso/issue-45
Add missing .conf to config files
pirms 10 gadiem
Johannes
247e6403a7
Add missing .conf to config files
Closes #45
pirms 10 gadiem
Nitin Madhok
1259f3eed8
Merge pull request #44 from jacksoncage/config-files
#12 Moved master and minion config file to .d folder
pirms 10 gadiem
Love Nyberg
75a1f888eb
#12 Moved master and minion config file to .d
pirms 10 gadiem
Nitin Madhok
fba928096b
Merge pull request #43 from danielfrg/patch-1
Added rest_cherrypy section
pirms 10 gadiem
Daniel Rodriguez
3bdf2789a1
Added rest_cherrypy section
pirms 10 gadiem
Nitin Madhok
6a6b02b418
Update README.rst
pirms 10 gadiem
Seth House
6c0cc53d5c
Merge pull request #42 from westurner/fix-nested-_roots
Fix for nested [file|pillar]_roots in minion tmpl (seeAlso: #37 )
pirms 10 gadiem
Joseph Hall
5bd3d62b42
Merge pull request #41 from jacksoncage/salt-cloud
Added functionality to state for salt cloud and exampel for EC2 and GCE
pirms 10 gadiem
Love Nyberg
6405354299
Fixed merge conflict and rearaged readme.
pirms 10 gadiem
Love Nyberg
4226594c7c
Merge pull request #1 from saltstack-formulas/master
Update from master
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