Niels Abspoel
83433c8dd8
Merge pull request #312 from netmanagers/master
Allow to specify reactors separatedly for master and minions
преди 7 години
Niels Abspoel
be266a180c
Merge pull request #314 from kakwa/ADD_SALT_REALEASE
add a way to set which release of saltstack to use
преди 7 години
Carpentier Pierre-Francois
5c3dc73f2a
fix map.jinja
add missing comas
преди 7 години
carpenti
6622d177bf
add a way to set which release of saltstack to use
SaltStack provides "versioned" repositories, this commit add a way
to set which release of salt to use.
It adds a pillar "salt:release" which can be set to a specific release
(ex: 2016.11). This release is then used to configure properly the
repositories URLs for Debian/Ubuntu/RedHat.
The default behavior is to point to 'latest', retaining the previous
behavior if the "salt:release" pillar is not set.
преди 7 години
Ion Dulgheru
165f2d727c
Fix master_tops configuration rendering
преди 7 години
Javier Bértoli
9331997269
Exclude reactors from f_defaults.conf
преди 7 години
Javier Bértoli
3a1e7ad9f9
Fix reactor examples
преди 7 години
Javier Bértoli
561eb4c5c8
Reactors should be in an array
преди 7 години
Javier Bértoli
442806ab9e
Allow to specify different reactors for minions and masters
преди 7 години
Niels Abspoel
eaf9fc98f6
Merge pull request #307 from M2Mobi/external_auth
Fix rendering of external_auth config.
преди 7 години
Heinz Wiesinger
68a2b72519
Fix rendering of external_auth config.
This now properly also supports per user, per minion as well as
function argument limiting.
преди 7 години
Nitin Madhok
eb09c3bdc6
Merge pull request #305 from EvaSDK/salt-cloud-cleanups
salt-cloud handling cleanups
преди 7 години
Gilles Dartiguelongue
87074cf3d9
Do not sync salt-cloud provided default configuration by default
As discussed in PR#305, these are defaults that even if they are
configurable as probably not suited to a majority of users and causes
delete/add output on highstate of user of the formula choses to use
the same file name.
преди 7 години
Gilles Dartiguelongue
4b29379725
Rework salt-cloud directories and files creation
Since the set of directories is known, just iterate of its well known
names directly. Make sure files are dumped after `file.recurse` to avoid
deletion/creation cycles when applying highstate.
Also apply permissions on cloud.providers.d after all creations steps
are done.
преди 7 години
Gilles Dartiguelongue
dce9bea40b
Compact salt-cloud pip.installed instructions
преди 7 години
Niels Abspoel
85597b3326
Merge pull request #306 from netmanagers/master
Wrong list name in config file
преди 7 години
Javier Bértoli
7093a32968
Simplify logic
преди 7 години
Javier Bértoli
997194c992
Wrong list name in config file
преди 7 години
Nitin Madhok
64925e902c
Merge pull request #304 from netmanagers/master
Updated minion and master config files to 2016.11
преди 7 години
Javier Bértoli
edce95f949
Updated master and minion default config files
Added parameters new to 2016.03 (or simply missing in the existing config).
преди 7 години
Niels Abspoel
03ec0dce2d
Merge pull request #301 from vquiering/move_to_publisher_acl
Add new publisher_acl to salt master config
преди 7 години
Niels Abspoel
ca204ea8c4
Merge pull request #302 from vquiering/fix_external_auth_config
add salt master config template external_auth settings
преди 7 години
Niels Abspoel
4b5ea5a544
Merge pull request #303 from tampakrap/syndic_user
add syndic_user option in the master config
преди 7 години
Theo Chatzimichos
57498d1645
add syndic_user option in the master config
преди 7 години
Vitali Quiering
f7189e2900
User publisher_acl setting in salt master config even if used client_acl in
pillar (backwards compatibility)
преди 7 години
Vitali Quiering
894bd15c79
fix salt master config template to use external_auth settings
преди 7 години
Vitali Quiering
d3b46a3648
add publisher_acl to salt master config
преди 7 години
puneet kandhari
31229c5a0d
Merge pull request #298 from 0xf10e/no_mapping_workaround
Hack to make rendering work on CentOS 6
преди 7 години
Florian Ermisch
e86e6fc221
Work around missing `is mapping` on CentOS/RHEL 6
Checks for 'dict' in `x.__class__.__name__` b/c
neither `type()` nor `isinstance()` is available.
преди 7 години
Florian Ermisch
5327e921fe
Hack to make rendering work on CentOS 6
!! Not tested with an actual !!
!! configured `ext_pillar` yet !!
- jinja on RHEL/CentOS 6 has no 'mapping'
test (see salt-formula issue #193 )
- {% do ... %} allows no assignment, only
function calls
- of course, `type(foo) is dict` doesn't
work because it's no jinja test
- maybe `.isinstance()` would be nicer/more
reliable
преди 7 години
Niels Abspoel
d34f63fdf0
Merge pull request #297 from Sjd-Risca/fix_lxc_keyword
fixed key reserved for lxc_profile file
преди 7 години
risca
ef120e56bc
fixed key reserved for lxc_profile file
преди 7 години
Niels Abspoel
a26e82f530
Merge pull request #288 from aboe76/fix_beacons
fix beacons on dev
преди 7 години
Niels Abspoel
c685ca7767
Merge pull request #277 from Furlot/patch-1
Add http proxy support for minion
преди 7 години
Niels Abspoel
2e792584d2
Merge pull request #281 from vermut/patch-1
Fixes jinja in include block
преди 7 години
Niels Abspoel
724e603689
Merge pull request #283 from irtnog/fix-root-group-bsd
Use a different group name for GID 0 depending on the minion's O/S
преди 7 години
Niels Abspoel
5ffed7de5c
fix beacons on dev
преди 7 години
Brian Jackson
cb050736b0
Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge
fix default dict warning with saltstack dev version
преди 7 години
Florian Ermisch
b4d55b80f9
Merge pull request #285 from leansalt/archlinux-pygit-libgit2
Arch Linux: install pygit2 or libgit2 via pacman instead of source
преди 7 години
Brian Jackson
d3dfd1b967
Merge pull request #287 from ek9/alpine-linux-support
Alpine Linux: add basic support
преди 7 години
ek9
d7af7c15bb
Alpine Linux: add basic support
преди 7 години
ek9
8ae39f4700
Arch Linux: install pygit2 or libgit2 via pacman instead of source by default
преди 7 години
Matthew X. Economou
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd
преди 7 години
Niels Abspoel
9e42d32000
Merge pull request #282 from rocket-labs-sysadmins/beacons
Added beacon configuration support
преди 7 години
Matthew X. Economou
3746f08f2f
Use a different group name for GID 0 depending on the minion's O/S
Some Unix variants name GID 0 "wheel". Unfortunately, one cannot
specify this group by ID, because Python conflates integer 0 with
boolean False, nor can one specify this group using the string '0',
because of assumptions in the Salt or Python codebases regarding group
names.
преди 7 години
Tobias Martin
fc40847542
fixed beacon variable name
преди 7 години
Tobias Martin
73906a03a5
added beacons configuration support
преди 7 години
Pavel Veretennikov
bad783ea28
Fixes jinja in include block
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
преди 7 години
Niels Abspoel
caff23424d
fix default dict
преди 7 години
Furlot
45e686b7f2
Add http proxy support for minion
преди 7 години