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