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

281 Commits

Author SHA1 Message Date
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
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
Niels Abspoel
caff23424d fix default dict 2017-01-12 23:40:41 +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
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
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
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
Matt Willsher
157f356442 Correct SmartOS config path 2016-11-14 22:22:52 +00:00
Matt Willsher
5b87c50e46 Add SmartOS salt-master and gitfs support 2016-11-14 22:13:52 +00: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
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
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
Niels Abspoel
64e7376fe4 fix minion daemon to be enabled if master_type is set to disable 2016-10-01 11:31:56 +02: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
Niels Abspoel
13a6ecf8b9 add missing files 2016-09-30 22:00:11 +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
Daniel Krämer
749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial 2016-09-13 09:03:06 +02:00
Daniel Krämer
a842dbe621 Fixes saltstack-formulas/salt-formula#190 2016-09-05 10:48:31 +02:00
Jeremy T. Bouse
79fcda8806 Clean up formating of nodegroups 2016-09-04 15:00:03 +00:00
Jeremy T. Bouse
a89d8d9b6b Add winrepo_provider to master.d/f_defaults.conf 2016-09-04 14:47:39 +00:00
Krzysztof Pawłowski
776c5ecbe6 Add yaml_utf8 option to salt master configuration. 2016-08-24 13:06:24 +02:00
Matthew Richardson
89ece150e6 Tidy up comments, add some docs/examples. 2016-08-23 09:48:39 +01:00
Matthew Richardson
5abdaee5a2 Handle config opts not part of default config. 2016-08-22 11:22:08 +01:00
Jeremy T. Bouse
3b265a544a Fix URLs in salt.pkgrepo for Raspbian & Ubuntu 
Rasbian reports back the following grain values:

local:
    ----------
    os:
        Raspbian
    os_family:
        Debian
    osarch:
        armhf
    osmajorrelease:
        8
    osrelease:
        8.0

Ubuntu reports back the following grain values:

local:
    ----------
    os:
        Ubuntu
    os_family:
        Debian
    osarch:
        amd64
    osmajorrelease:
        14
    osrelease:
        14.04

For Raspbian the osarch needed to be changed from other Debain os_family
distributions.
For Ubuntu the osrelease value is needed instead of osmajorrelease as other
Debian os_family distributions.

Part of #180
 2016-08-13 15:29:03 -04:00
Rene Jochum
f17b8f5424 Add optional method to remove /etc/salt/master. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-15 15:13:21 +02:00
Rene Jochum
1b611c871e Add optional method to remove /etc/salt/minion. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-15 15:11:55 +02:00
Rene Jochum
fa6818af35 Use https for the Ubuntu repo same as salt-bootstrap. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-14 18:20:04 +02:00
Matthew X. Economou
12390494cf Add support for s3fs 2016-07-09 08:29:33 -04:00
Rene Jochum
6ae81a9640 Add support for mongodb connection settings to config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 18:44:51 +02:00