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

950 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daniel Krämer
749bf0e863 [BIGFUX] make pygit2 work with ubuntu xenial 2016-09-13 09:03:06 +02:00
Forrest
52bc1badca Merge pull request #251 from UGNS/master 
Clean-up master.d/f_defaults.conf and add winrepo_provider
 2016-09-06 00:21:59 -07:00
Jeremy T. Bouse
4283cba123 Add example for winrepo_provider 2016-09-06 05:33:23 +00: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
Forrest
2a80f55a17 Merge pull request #249 from msciciel/salt-master-yaml-utf8 
Add yaml_utf8 option to salt master configuration.
 2016-08-24 09:47:52 -07:00
Krzysztof Pawłowski
776c5ecbe6 Add yaml_utf8 option to salt master configuration. 2016-08-24 13:06:24 +02:00
Forrest
5dd3eac097 Merge pull request #247 from mrichar1/other_opts 
Handle config opts not part of default config.
 2016-08-23 10:48:18 -07: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
Niels Abspoel
39a329b693 Merge pull request #245 from UGNS/raspbian 
Fix URLs in salt.pkgrepo for Raspbian & Ubuntu
 2016-08-15 16:44:27 +02: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
Forrest
8050f6cf95 Merge pull request #243 from pcdummy/master 
https for the ubuntu repo and option to remove /etc/salt/minion.
 2016-07-15 09:02:57 -07: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
Brian Jackson
15d39babb6 Merge pull request #242 from irtnog/add-s3fs-support 
Add support for s3fs
 2016-07-12 15:43:54 -07:00
Matthew X. Economou
d7be9aba9f Document sample s3fs configuration 2016-07-09 21:23:49 -04:00
Matthew X. Economou
12390494cf Add support for s3fs 2016-07-09 08:29:33 -04:00
Forrest
55864f7cdf Merge pull request #241 from pcdummy/mongodb 
add support for mongodb settings
 2016-07-07 10:22:18 -07: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
Rene Jochum
478fef683b Remove trailing whitespaces in config templates. 
Signed-off-by: Rene Jochum <rene@jochums.at>
 2016-07-07 16:22:16 +02:00
Forrest
e1b664f4d3 Merge pull request #240 from mwpher/master 
Add support for OpenBSD in map.jinja
 2016-07-01 19:49:46 -07:00
Matthew Pherigo
621e1f218c Add support for OpenBSD in map.jinja 2016-07-01 21:25:06 -05:00
Forrest
5f03ce9db1 Merge pull request #234 from rhertzog/pkgrepo-update 
Use repo.saltstack.com in salt.pkgrepo for Debian-based distributions
 2016-06-30 09:21:18 -07:00
Forrest
137868bcc1 Merge pull request #237 from msonawane/master 
add module_config for minions
 2016-06-26 18:40:47 -07:00