saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity
508 Commits 3 Branches 68 Tags 2 MiB
eb09c3bdc6
Commit Graph

508 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nitin Madhok
eb09c3bdc6 Merge pull request #305 from EvaSDK/salt-cloud-cleanups 
salt-cloud handling cleanups
 2017-04-23 12:47:31 -04:00
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.
 2017-04-11 13:54:05 +02:00
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.
 2017-04-11 13:34:50 +02:00
Gilles Dartiguelongue
dce9bea40b Compact salt-cloud pip.installed instructions 2017-04-11 13:34:50 +02:00
Niels Abspoel
85597b3326 Merge pull request #306 from netmanagers/master 
Wrong list name in config file
 2017-04-10 19:35:19 +02:00
Javier Bértoli
7093a32968 Simplify logic 2017-04-10 12:14:12 -03:00
Javier Bértoli
997194c992 Wrong list name in config file 2017-04-10 12:11:09 -03:00
Nitin Madhok
64925e902c Merge pull request #304 from netmanagers/master 
Updated minion and master config files to 2016.11
 2017-04-10 10:04:38 -04:00
Javier Bértoli
edce95f949 Updated master and minion default config files 
Added parameters new to 2016.03 (or simply missing in the existing config).
 2017-04-09 14:27:30 -03:00
Niels Abspoel
03ec0dce2d Merge pull request #301 from vquiering/move_to_publisher_acl 
Add new publisher_acl to salt master config
 2017-04-08 12:05:15 +02:00
Niels Abspoel
ca204ea8c4 Merge pull request #302 from vquiering/fix_external_auth_config 
add salt master config template external_auth settings
 2017-04-08 12:04:57 +02:00
Niels Abspoel
4b5ea5a544 Merge pull request #303 from tampakrap/syndic_user 
add syndic_user option in the master config
 2017-04-07 13:14:58 +02:00
Theo Chatzimichos
57498d1645
add syndic_user option in the master config 2017-04-07 12:12:21 +02:00
Vitali Quiering
f7189e2900 User publisher_acl setting in salt master config even if used client_acl in 
pillar (backwards compatibility)
 2017-03-27 08:39:05 +02:00
Vitali Quiering
894bd15c79 fix salt master config template to use external_auth settings 2017-03-25 19:59:16 +01:00
Vitali Quiering
d3b46a3648 add publisher_acl to salt master config 2017-03-24 13:07:19 +01:00
puneet kandhari
31229c5a0d Merge pull request #298 from 0xf10e/no_mapping_workaround 
Hack to make rendering work on CentOS 6
 2017-03-04 05:17:38 -06:00
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.
 2017-02-24 18:10:54 +01:00
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
 2017-02-24 13:40:40 +01:00
Niels Abspoel
d34f63fdf0 Merge pull request #297 from Sjd-Risca/fix_lxc_keyword 
fixed key reserved for lxc_profile file
 2017-02-24 00:03:04 +01:00
risca
ef120e56bc fixed key reserved for lxc_profile file 2017-02-23 23:51:14 +01:00
Niels Abspoel
a26e82f530 Merge pull request #288 from aboe76/fix_beacons 
fix beacons on dev
 2017-02-01 22:53:44 +01:00
Niels Abspoel
c685ca7767 Merge pull request #277 from Furlot/patch-1 
Add http proxy support for minion
 2017-01-22 23:45:25 +01:00
Niels Abspoel
2e792584d2 Merge pull request #281 from vermut/patch-1 
Fixes jinja in include block
 2017-01-22 23:37:28 +01:00
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
 2017-01-22 23:35:52 +01:00
Niels Abspoel
5ffed7de5c fix beacons on dev 2017-01-21 22:58:31 +01:00
Brian Jackson
cb050736b0 Merge pull request #279 from aboe76/fix_pillar_dict_with_default_merge 
fix default dict warning with saltstack dev version
 2017-01-21 11:41:49 -08:00
Florian Ermisch
b4d55b80f9 Merge pull request #285 from leansalt/archlinux-pygit-libgit2 
Arch Linux: install pygit2 or libgit2 via pacman instead of source
 2017-01-15 12:03:45 +01:00
Brian Jackson
d3dfd1b967 Merge pull request #287 from ek9/alpine-linux-support 
Alpine Linux: add basic support
 2017-01-14 12:09:15 -08:00
ek9
d7af7c15bb Alpine Linux: add basic support 2017-01-13 17:31:47 +01:00
ek9
8ae39f4700 Arch Linux: install pygit2 or libgit2 via pacman instead of source by default 2017-01-13 17:03:19 +01:00
Matthew X. Economou
c43657487f
Merge branch 'master' of github.com:saltstack-formulas/salt-formula into fix-root-group-bsd 2017-01-13 10:21:14 -05:00
Niels Abspoel
9e42d32000 Merge pull request #282 from rocket-labs-sysadmins/beacons 
Added beacon configuration support
 2017-01-13 16:20:31 +01:00
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.
 2017-01-13 10:14:34 -05:00
Tobias Martin
fc40847542
fixed beacon variable name 2017-01-13 15:26:17 +01:00
Tobias Martin
73906a03a5
added beacons configuration support 2017-01-13 14:22:39 +01:00
Pavel Veretennikov
bad783ea28 Fixes jinja in include block 
Some vars were missing {{ }}
Indentation was broken
isinstance is not available in Salt
 2017-01-13 14:58:59 +02:00
Niels Abspoel
caff23424d fix default dict 2017-01-12 23:40:41 +01:00
Furlot
45e686b7f2 Add http proxy support for minion 2017-01-06 17:12:59 +01:00
Brian Jackson
f58562beeb Merge pull request #276 from saltstack-formulas/fix_pygit2_debian 
Fix pygit2-libgit2 builds on Debian like platforms.
 2016-12-25 23:17:47 -08:00
Rene Jochum
6fab0c54c6 Merge pull request #274 from jebas/master 
Correction for Fedora packaging.
 2016-12-26 08:01:44 +01:00
Rene Jochum
e329bda7bf Fix pygit2-libgit2 builds on Debian like platforms. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-12-25 17:41:47 +01:00
Jeff Baskin
0166cd4097 Added fedora. 2016-12-19 23:29:42 -05:00
Forrest
13f06a8ae5 Merge pull request #273 from jerrykan/saltapi 
Have salt-api service watch the master config files
 2016-12-07 21:35:14 -08:00
John Kristensen
43663fec1b Have salt-api service watch the master config files 
The salt-api service is configured using the master config files but is
not restarted when the master is restarted. We need the salt-api service
to watch the master config files to ensure that any config changes are
picked up.
 2016-12-08 12:19:53 +11:00
Forrest
f3f2251d75 Merge pull request #271 from dafyddj/add-master-other-settings 
allow non-default config settings in master.d/f_defaults.conf …
 2016-12-01 14:13:04 -08:00
Dafydd Jones
8e41067c69 allow non-default config settings in master.d/f_defaults.conf (similar to PR#247) 2016-12-01 21:30:12 +00:00
Brian Jackson
d68c0b63ee Merge pull request #267 from fizmat/pkgrepo-cleanup 
Pkgrepo cleanup
 2016-11-21 22:53:47 -08:00
Forrest
111cbd44d1 Merge pull request #269 from mattwillsher/smartos-support 
Correct SmartOS config path
 2016-11-14 14:37:50 -08:00
Matt Willsher
157f356442 Correct SmartOS config path 2016-11-14 22:22:52 +00:00