Niels Abspoel
90f23948ef
create config option for mine_interval
преди 9 години
Niels Abspoel
b8e53771f3
add mine_get function to master config
преди 9 години
Will Saxon
ae8e4ca492
don't try to load pkgrepo on non-Debian distros
fixes #83 by wrapping contents of pkgrepo/init.sls in an {% if %}.
Change-Id: I8260fdf5cf802c0b28197516da374add6c3002a2
преди 10 години
Niels Abspoel
23fd8b64af
Fix #39 multi master support to minion
This will fix #39
And it will be backwards compatible with the current pillar configuration.
преди 10 години
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
преди 10 години
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
преди 10 години
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
преди 10 години
Jimmy Tang
deee69319f
Add mine_functions to master config template
преди 10 години
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
updated the map style without the base='default' parameter
преди 10 години
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
преди 10 години
Simon Lloyd
cb03e885d4
Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
преди 10 години
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
преди 10 години
Niels Abspoel
4dc0044772
update use_lookup_map with merges from 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 години
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
преди 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 години
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 години
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 години
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 години
Niels Abspoel
af7f9d722a
more improvements in _defaults.conf
better newlines with iterations.
преди 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 години
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
a54d52a5bc
fix opensuse packaging
преди 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 години
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 години
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
bb09803f90
Revert "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 години
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 години
Tim O'Guin
9fa42fe09d
fixed YAML issue with templated reactor config
преди 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 години
Ajna Cackovic
2b51a6f0c3
Allow repo options to be set per repo for gitfs_remotes in pillar
преди 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 години