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

927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Forrest
88794c8c62 Merge pull request #268 from mattwillsher/smartos-support 
Add SmartOS salt-master, minion and gitfs support
 2016-11-14 14:17:25 -08:00
Matt Willsher
5b87c50e46 Add SmartOS salt-master and gitfs support 2016-11-14 22:13:52 +00:00
Forrest
af02bc5b78 Merge pull request #266 from fizmat/arch-update 
update map.jinja after Arch renamed the package
 2016-11-10 09:15:02 -08:00
Ivan Kadochnikov
8552113226 update map.jinja after Arch renamed the package 2016-11-10 16:05:48 +03:00
Ivan Kadochnikov
fd0b200fea Delete repotype from map.jinja, unused after 8f2191471 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
e18eeffb5e Delete debian saltstack repo gpg, not used since 87f3e849d2 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
fcefad0899 Delete pkgrepo/ubuntu, not used anymore 2016-11-10 11:09:19 +03:00
Ivan Kadochnikov
13ea551011 Simplify pkgrepo logic, made possible by 3b265a544 2016-11-10 11:09:19 +03:00
Forrest
01043740dc Merge pull request #259 from kakwa/separate_engines_config 
make the configuration of engines specific to master or minion
 2016-11-09 12:08:33 -08:00
Niels Abspoel
ff8bf379a7 Merge pull request #261 from fizmat/pkgrepo-redhat 
Add state that ensures pkgrepo for RedHat is absent
 2016-11-09 20:46:34 +01:00
Forrest
f6551c5fc8 Merge pull request #265 from genuss/pillar_opts 
Change default value for pillar_opts
 2016-11-09 10:01:41 -08:00
genuss
8fd8c76d5f Change default value for pillar_opts 2016-11-09 20:48:15 +03:00
Forrest
d6affbba39 Merge pull request #263 from robruma/feature/support_master_id_option 
Adding support for master_id option
 2016-10-14 09:35:34 -07:00
Rob Ruma
6f4880a258 Adding support for master_id option documented in https://docs.saltstack.com/en/latest/ref/configuration/master.html#master-id 2016-10-14 08:25:18 -04:00
Ivan Kadochnikov
423d58dd88 Add state that ensures pkgrepo for RedHat is absent 2016-10-07 16:50:46 +03:00
Forrest
07aa250925 Merge pull request #260 from mothbe/master 
typo - top_file_merging_strategy (f_defaults.conf) template
 2016-10-06 15:56:02 -07:00
Marcin Witowski
9d0b6b03d8 fix typo for top_file_merging_strategy in salt/files/master.d/f_defaults.conf template 2016-10-07 00:48:59 +02:00
carpenti
3098aebcad add engines as a reserved_keys to not add generic configuration 2016-10-05 22:28:33 +02:00
carpenti
08d10376ab implementing retro-compatible behavior 
Using the old salt.engines pillar and merging it with the new
salt.[master|minion].engines pillar.
This way, it doesn't break previous behavior and permits to define
common engines on master and minion.
In the merge, the salt.[master|minion].engines pillar takes precedence
if conflict as it's the more specific pillar.
 2016-10-05 21:14:00 +02:00
carpenti
c27bfd92b7 make the configuration of engines specific to master or minion 
the engines are now configured using the following pillars:

* salt.master.engines
* salt.minion.engines

instead of a global salt.engines pillar.

Note: the pillar.example provided seems to assume this behaviour.
(the pillar is salt.master.engines.slack and not salt.engines.slack)
 2016-10-05 10:26:36 +02:00
Forrest
5e9c937931 Merge pull request #258 from aboe76/enable_salt_minion_standalone 
fix minion daemon to be enabled if master_type is set to disable
 2016-10-01 11:12:08 -07:00
Niels Abspoel
64e7376fe4 fix minion daemon to be enabled if master_type is set to disable 2016-10-01 11:31:56 +02:00
Forrest
e76880d500 Merge pull request #257 from aboe76/salt-minion_standalone_with_service 
add option to start minion service if master_type is set to disable
 2016-10-01 00:50:25 -07:00
Niels Abspoel
1ffbb4b6bc add option to start minion service if master_type is set to disable 2016-10-01 09:47:29 +02:00
Forrest
e464109c92 Merge pull request #256 from aboe76/missing_files 
add missing files
 2016-09-30 13:43:17 -07:00
Niels Abspoel
13a6ecf8b9 add missing files 2016-09-30 22:00:11 +02:00
Forrest
894351b248 Merge pull request #255 from aboe76/minion_engines_reactors 
add engine and reactor config to salt minion configuration
 2016-09-30 12:44:16 -07:00
Niels Abspoel
ddaa166de2 add engine and reactor config to salt minion configuration 2016-09-30 21:27:20 +02:00
Javier Bértoli
4e8d36f308 Merge pull request #253 from jerrykan/cloud_without_pip 
By default don't install cloud dependencies using pip
 2016-09-21 06:35:17 -03:00
John Kristensen
37f82242e7 By default don't install cloud dependencies using pip 
The salt-cloud packages automatically pull in the pycrypto and libcloud
dependencies for RedHat and Debian (at least when using the SaltStack
repos), so it doesn't really make sense to install these dependencies
using pip. By default we no longer use pip, but the old behaviour can be
restored by setting 'salt:use_pip' to True in the pillar.

There could probably be a case made for removing the pip stuff
altogether, but we will leave it in for the time being to preserve some
backwards compatibility.
 2016-09-21 17:01:37 +10:00
Forrest
ad440d904c Merge pull request #250 from luitzifa/master 
Fixes saltstack-formulas/salt-formula#190
 2016-09-13 09:33:59 -07:00