0d8b10bb75
Merge pull request #70 from aboe76/fix_gitfs_spacing
...
fix spacing with gitfs.
2014-12-13 01:34:59 -07:00
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
7da141721b
fix spacing with gitfs.
...
Updated gitfs jinja, to mirror master file
2014-12-09 23:22:06 +01:00
8dbde0f1be
Merge pull request #68 from aboe76/minion_gitfs_support
...
Added support for salt minion gitfs
2014-12-08 16:21:01 -05:00
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
682c9478cc
Merge pull request #67 from aboe76/opensuse_support
...
fix opensuse packaging
2014-12-08 21:14:29 +01:00
a54d52a5bc
fix opensuse packaging
2014-12-08 21:13:29 +01:00
ccff141c21
Merge pull request #66 from aboe76/opensuse_support
...
added openSUSE support
2014-12-05 18:18:08 -05:00
27bf5324ee
added openSUSE support
2014-12-05 23:33:47 +01:00
be972d9057
updated salt-master config template to add presence_events setting
2014-11-25 10:18:20 -06:00
00a9e0640c
Removing unnecessary -
...
I don't understand why unnecessary ``-`` were added after and before ``{%-`` and ``-%}``
2014-11-14 01:19:37 -05:00
64a63eda93
Merge pull request #65 from PlayFab/master
...
Test if individual gitfs remote is string
2014-11-13 11:35:13 -08:00
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
570b45a9ef
Removing crypto pip dependency for complete RedHat family
2014-11-12 20:56:15 -05:00
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
3b892e47cc
Merge pull request #62 from sinnerschrader/fix/support_jinja_lt_2_6
...
enables use of jinja < 2.6
2014-11-09 10:11:44 -05:00
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
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
a8227385cc
Typo fix
...
Fixing typo
2014-11-06 14:23:52 -05:00
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
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
5f967781bc
Merge pull request #61 from saltstack-formulas/revert-60-cryptodep
...
Revert "Removed crypto dependency from salt.cloud."
2014-11-05 14:59:38 -05:00
bb09803f90
Revert "Removed crypto dependency from salt.cloud."
2014-11-05 14:59:26 -05:00
b0284ad590
Merge pull request #60 from andrew-vant/cryptodep
...
Removed crypto dependency from salt.cloud.
2014-11-05 13:03:31 -05:00
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
8100753f71
Merge pull request #58 from juiceinc/ssh-roster
...
Add salt.ssh state for installing and configuring salt-ssh
2014-10-28 12:58:07 -04:00
cfa1f4eafc
fix syntax issues in package-map.jinja
2014-10-28 11:50:23 -05:00
a3c54f0e8f
added salt-ssh to package-map.jinja for most OS families
2014-10-28 11:46:38 -05:00
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
4e32c5e6ee
Merge pull request #57 from juiceinc/master
...
Fix YAML issue with templated reactor config
2014-10-28 11:58:29 -04:00
9fa42fe09d
fixed YAML issue with templated reactor config
2014-10-28 10:55:18 -05:00
69b2ee3812
Merge pull request #56 from juiceinc/master
...
add templated file for reactor configuration and update pillar.example.
2014-10-24 17:45:07 -07:00
3d52dfd8ec
added proper indentation for jinja conditionals in reactor template
2014-10-24 17:04:12 -05:00
2852e7b897
add templated file for reactor configuration and update pillar.example.
2014-10-24 14:48:56 -05:00
3e4d9d012b
Merge pull request #55 from OneID/feature/gitfs-repo-options
...
Allow individual repo options for gitfs_remotes
2014-10-23 23:32:14 -07:00
9dab2f9dab
Update pillar.example to show gitfs_remotes option usage
2014-10-23 18:33:16 -07:00
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
2014-10-23 18:32:47 -07:00
2013d4b499
Merge pull request #53 from ZetaBit/vagrant
...
Vagrant
2014-10-17 09:46:15 -04:00
ca4a58ec1a
Added a basic description of Vagrant usage.
2014-10-17 10:21:24 +02:00
0c0b1745a8
Vagrant: increased wait to ensure the minion sent it's key to the master before Accepting all keys.
2014-10-17 09:46:33 +02:00
862421e80f
Added a Vagrant setup to instantly test the formula
2014-10-16 17:30:04 +02:00
1682df8592
Merge remote-tracking branch 'origin/pr/47'
...
Conflicts:
salt/master.sls
salt/minion.sls
2014-10-09 16:39:07 -06:00
51e493e448
Merge pull request #52 from andrew-vant/salt.d.doc
...
Readme note about user-provided configuration templates.
2014-10-06 12:36:50 -04:00
013736e2ca
Readme note about user-provided configuration templates.
2014-10-06 12:34:25 -04:00
05087a8d42
Merge pull request #51 from andrew-vant/salt.d
...
Added recursive management of minion.d and master.d.
2014-10-06 09:15:53 -07:00
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
095c6a8e4b
Merge pull request #50 from andrew-vant/rsprov
...
Added salt-cloud support for Rackspace OpenStack servers.
2014-10-03 18:58:59 -07:00
970da0ef37
Added salt-cloud support for Rackspace OpenStack servers.
2014-10-03 21:23:50 -04:00
4702e77756
Merge pull request #49 from johtso/issue-48
...
Avoid config key clashes
2014-10-03 11:46:55 -07:00
791025e065
Avoid config key clashes
...
Fixes #48
2014-10-03 09:43:59 +01:00
Seth House
Niels Abspoel
Nitin Madhok
Tim O'Guin
Forrest
Tiru Srikantha
Marvin Frick
Andrew Vant
Ajna Cackovic
Martin Griesbach
Johannes