Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
10 年之前
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
Add support for presence_events setting in master config template
10 年之前
Tim O'Guin
b19c3acc77
merged with upstream
10 年之前
Niels Abspoel
896578a75a
Removed package_map lookup
Added map.jinja solution more in line with other formulas,
This also improves issue #30
and pull request #30
10 年之前
Nitin Madhok
e8e01e34d9
Merge pull request #80 from aboe76/update_config_2014.7
updated minion _defaults.conf to version 2014.7
10 年之前
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
10 年之前
Forrest
77c0ecd729
Merge pull request #78 from qbcode/master
Add saltify provider, map and profile templates
10 年之前
Forrest
c0af23f439
Merge pull request #79 from rhertzog/misc-bugfixes
Fix regression for old salt versions and bugfix for event_return_whitelist/event_return_blacklist options
10 年之前
Raphaël Hertzog
7fb86b9076
Fix the handling of event_return_whitelist/event_return_blacklist
If those options are set in pillar data, the jinja template
salt/files/master.d/_defaults.conf would fail to compile trying to
evaluate non-existing variables.
Replace those variables with the corresponding dictionnary entries.
10 年之前
Raphaël Hertzog
d4ae38f825
Import the salt/formulas.jinja template with context
This is only needed for salt versions older than 2014.7 that do not
define the global "salt" variable in such context.
10 年之前
Raphaël Hertzog
445108f87a
Avoid “set salt” jinja calls that mask the usual salt variable
Most include do not expect salt to be something else than the usual salt
variable giving access to all the salt modules. Instead we use cfg_salt.
And for consistency we rename the master/minion variables to
cfg_master/cfg_minion too.
10 年之前
Jimmy Tang
b687659bff
Initial add of dummy saltify settings
This commit also provides a more concrete example of a 'host' to
be saltified. Users can do
salt-cloud -p make_salty someinstance
or
salt-cloud -m /etc/salt/cloud.maps.d/foo.conf
Either which way the online docs should really be updated with more
concrete examples.
10 年之前
Wolodja Wentland
98917adad2
Merge pull request #77 from rhertzog/misc-bugfixes
FIxes for nodegroups/log_granular_levels settings and small cleanups
10 年之前
Nitin Madhok
4bd82e79e9
Merge pull request #76 from rhertzog/formulas
Add new “salt.formulas” state to manage salt formulas
10 年之前
Raphaël Hertzog
8a828b506e
Use items() method instead of iteritems() for Python 3 compatibility
In Python 3, dict.items() is already an iterator while dict.iteritems() no
longer exits. In Python 2, dict.items() is not an iterator but it works
and the small performance hit doesn't really matter for the salt config
pillar data which is really small.
10 年之前
Raphaël Hertzog
2f2cd972ac
Use items() method to loop over nodegroups/log_granular_levels dictionaries
Otherwise you get an “ValueError: too many values to unpack” exception
when you make use of those entries in your pillar data.
10 年之前
Raphaël Hertzog
f46b4f29d8
Add new “salt.formulas” state to manage salt formulas
This state downloads formulas from git repositories and ensures
that they are recorded in the file_roots setting.
10 年之前
Seth House
02f8debea8
Merge pull request #72 from aboe76/update_config_2014.7
Updated master config file to 2014.7
10 年之前
Nitin Madhok
838386e0f1
Merge pull request #74 from rhertzog/standalone
Fix link and title in salt.standalone section of README.rst
10 年之前
Nitin Madhok
d7c332724d
Merge pull request #75 from rhertzog/pkgrepo
Add new “salt.pkgrepo” state
10 年之前
Raphaël Hertzog
41f85695b3
Fix link and title in salt.standalone section of README.rst
10 年之前
Raphaël Hertzog
339adddfcc
Add new “salt.pkgrepo” state
This state enables the official saltstack package repository in order to
always benefit from the latest version. This state currently only works on
Debian and Ubuntu, and aims to implement the installation recommendations
of the official documentation:
http://docs.saltstack.com/en/latest/topics/installation/index.html
10 年之前
Wolodja Wentland
c8c0781e8f
Merge pull request #73 from rhertzog/standalone
Add a “salt.standalone” state
10 年之前
Raphaël Hertzog
b93ec22244
Add a “salt.standalone” state
10 年之前
Niels Abspoel
5029504212
Updated master config file to 2014.7
Fixed explanations, and improved logic code to client_acl
10 年之前
Nitin Madhok
b565c5f54c
Merge pull request #71 from aboe76/improve_config
more improvements in _defaults.conf
10 年之前
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
10 年之前
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 年之前