Marvin Frick
868854c2e7
enables use of jinja < 2.6
...
Commit 2b51a6f0c3http://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
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
Chris McNabb
028412ee5e
use master when if in master
2014-03-28 15:13:33 -04:00
Chris McNabb
d0392b576e
add Amazon os
2014-03-19 14:06:27 -04:00
Oleg Tsarev
18d7471198
Supported Arch Linux
2014-02-11 07:17:48 +04:00
Oleg Tsarev
e3b2ebeb06
Actualized master and minion config files templates
2014-02-11 07:04:03 +04:00
tiger-seo
507f2abc1a
possibility to define Halite configuration for salt-master
2014-01-14 12:30:43 +02:00
tiger-seo
f4b839a4fb
sync with https://github.com/saltstack/salt/blob/v0.17.4/conf/master and minion
2014-01-08 15:29:39 +02:00
Kenneth Wilke
9404ebf915
Added module_config section to minion template
2013-09-03 09:45:24 -05:00
Kenneth Wilke
d337cc2784
Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula
2013-08-27 11:14:18 -05:00
Kenneth Wilke
e3a29bf69a
ext_pillar fix
2013-08-27 10:33:06 -05:00
Kenneth Wilke
1f71bef33b
jijna syntax fix
2013-08-27 10:30:23 -05:00
Kenneth Wilke
e104b3eb41
fixed ext_pillar
2013-08-27 10:28:33 -05:00
Kenneth Wilke
426493b76d
fixed ext_pillar
2013-08-27 10:20:42 -05:00
Justin Phelps
6282d9570c
Corrected the typo for the minion configuration file.
2013-08-23 16:03:26 -05:00
Kenneth Wilke
c080cf37d6
ext_pillar fix
2013-08-23 12:01:36 -05:00
Kenneth Wilke
e83d25b80f
newline fix
2013-08-23 11:57:45 -05:00
Kenneth Wilke
98fd674c95
indentation fix
2013-08-23 11:55:09 -05:00
Kenneth Wilke
92b2572734
newline fix
2013-08-23 11:54:12 -05:00
Kenneth Wilke
153feac309
Edited master template
...
made fileserver_backend and gitfs_remotes look more like expected
2013-08-23 11:52:46 -05:00
Kenneth Wilke
a14ded0b6e
really more gentoo
2013-08-15 10:16:54 -05:00
Kenneth Wilke
5c3ffbd43c
added salt package mapping for gentoo
2013-08-15 10:15:47 -05:00
Kenneth Wilke
48e2e326b2
fixed missing curly brackets
2013-08-14 16:21:15 -05:00
