Brian Jackson
cb3aa80c62
Don't overwrite salt variable
Using a variable named salt is a bad idea when salt already has a variable
named salt.
9 anni fa
Nitin Madhok
6a1fc70477
Merge pull request #102 from aboe76/salt-api
Added salt-api support
9 anni fa
Niels Abspoel
5785091305
Added salt-api support
9 anni fa
Nitin Madhok
61a7bc1ddc
Merge pull request #101 from aboe76/fix_opensuse
fix suse os_family
9 anni fa
Niels Abspoel
5d09355c84
fix suse os_family
9 anni fa
Nitin Madhok
ab93f6f1dc
Merge pull request #100 from aboe76/mine_interval_minion
create config option for mine_interval
9 anni fa
Niels Abspoel
90f23948ef
create config option for mine_interval
9 anni fa
Nitin Madhok
cde11bc1e8
Merge pull request #99 from aboe76/mine_get_master
add mine_get function to master config
9 anni fa
Niels Abspoel
b8e53771f3
add mine_get function to master config
9 anni fa
Forrest
ed0f2fab20
Merge pull request #98 from saxonww/master
don't try to load pkgrepo on non-Debian distros
10 anni fa
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 anni fa
Nitin Madhok
1b13259823
Merge pull request #97 from aboe76/multi_master
Fix #39 multi master support to minion
10 anni fa
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 anni fa
Nitin Madhok
22fe873c5b
Merge pull request #96 from aboe76/rest_tornado
added rest_tornado to _defaults.conf
10 anni fa
Niels Abspoel
7ddc1692ec
added rest_tornado to _defaults.conf
see pillar.example for configuration
10 anni fa
Nitin Madhok
f39fff2329
Merge pull request #90 from aboe76/master
Updated map.jinja for archlinux package convention
10 anni fa
Niels Abspoel
de71de216e
Merge pull request #94 from jcftang/master
saltify provider should set correct master
10 anni fa
Jimmy Tang
2e30a44e41
saltify provider should set correct master
This is necessary for the correct settings on the minions when saltifying new hosts
10 anni fa
Nitin Madhok
f2131b05f3
Merge pull request #92 from saltstack-formulas/revert-91-master
Revert "Add mine_functions to master config template"
10 anni fa
Nitin Madhok
fa6c39eccd
Revert "Add mine_functions to master config template"
10 anni fa
Nitin Madhok
5cec66107a
Merge pull request #91 from qbcode/master
Add mine_functions to master config template
10 anni fa
Jimmy Tang
deee69319f
Add mine_functions to master config template
10 anni fa
Niels Abspoel
d071713fa7
update pillar.example for new lookup
10 anni fa
Niels Abspoel
7b4104cf6e
updated archlinux map.jinja, to install salt-zmq
updated the map style without the base='default' parameter
10 anni fa
Wolodja Wentland
d3b920f5c7
Merge pull request #87 from aboe76/master
fix salt-ssh on Arch and Opensuse
10 anni fa
Niels Abspoel
ea4623b0a3
fix salt-ssh on Arch and Opensuse
10 anni fa
Nitin Madhok
07b4fbd86a
Merge pull request #86 from smlloyd/master
Fix: pkgs is undefined
10 anni fa
Simon Lloyd
cb03e885d4
Fix: pkgs is undefined
Update sls files to match name change in map.jinja.
10 anni fa
Nitin Madhok
9821a94104
Merge pull request #85 from aboe76/master
fix #84 with same logic as dnsmasq-formula
10 anni fa
Niels Abspoel
acf5832f68
fix #84 with same logic as dnsmasq-formula
10 anni fa
Seth House
77522d6e56
Merge pull request #81 from aboe76/use_lookup_map.jinja
Removed package_map lookup
10 anni fa
Niels Abspoel
4dc0044772
update use_lookup_map with merges from upstream
10 anni fa
Niels Abspoel
daf04c2688
Merge branch 'master' into use_lookup_map.jinja
10 anni fa
Nitin Madhok
96b409fa90
Merge pull request #82 from juiceinc/master
Add support for presence_events setting in master config template
10 anni fa
Tim O'Guin
b19c3acc77
merged with upstream
10 anni fa
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 anni fa
Nitin Madhok
e8e01e34d9
Merge pull request #80 from aboe76/update_config_2014.7
updated minion _defaults.conf to version 2014.7
10 anni fa
Niels Abspoel
5bed5368e2
updated minion _defaults.conf to version 2014.7
10 anni fa
Forrest
77c0ecd729
Merge pull request #78 from qbcode/master
Add saltify provider, map and profile templates
10 anni fa
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 anni fa
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 anni fa
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 anni fa
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 anni fa
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 anni fa
Wolodja Wentland
98917adad2
Merge pull request #77 from rhertzog/misc-bugfixes
FIxes for nodegroups/log_granular_levels settings and small cleanups
10 anni fa
Nitin Madhok
4bd82e79e9
Merge pull request #76 from rhertzog/formulas
Add new “salt.formulas” state to manage salt formulas
10 anni fa
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 anni fa
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 anni fa
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 anni fa
Seth House
02f8debea8
Merge pull request #72 from aboe76/update_config_2014.7
Updated master config file to 2014.7
10 anni fa