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

432 Commits

Author SHA1 Message Date
Niels Abspoel
5eee4c61dc
Merge pull request #397 from myii/PR_364-py3 
Fix `repo.saltstack.com` URLs for Python 3 packages (#364)
 2019-02-01 17:37:23 +01:00
Imran Iqbal
f7be659561 Fix repo.saltstack.com URLs for Python 3 packages (#364) 2019-01-29 13:37:35 +00:00
Imran Iqbal
feb09698ce Fix salt:lookup regression 2019-01-29 05:38:25 +00:00
Niels Abspoel
66c0699814 fix small issues found by @myii 2019-01-26 11:10:44 +01:00
Niels Abspoel
7fdba98802 fix typo 2019-01-25 22:05:21 +01:00
Niels Abspoel
93682852a7 simplify map.jinja 2019-01-25 21:35:16 +01:00
Raluca Samuilescu
68f8d57e05 Fix repo.saltstack.com URLs for pinned minor release (#364) 
* All minor releases appear in an `archive` sub-directory.
* Resolves main bug in GitHub issue #364.
* Simplification of original GitHub PR #365 by @ralucasg.
 2019-01-25 15:32:03 +00:00
Thor77
ff34b1f8a4
Add missing GitPython-package for Arch 2019-01-05 12:06:54 +01:00
Niels Abspoel
ec7984ca02
Merge pull request #391 from noelmcloughlin/fixes 
shutoff debug output from unless
 2018-12-20 22:46:01 +01:00
N
2a0f4617db
shutup debug output from unless 2018-12-20 21:08:15 +00:00
Niels Abspoel
3888519cdf
Merge pull request #381 from starops/external_auth-file-directives 
Add support for file external_auth special directives
 2018-12-19 20:41:25 +01:00
Niels Abspoel
b13bc6d461
Merge pull request #387 from M2Mobi/extra_config_mapping 
Fix support for extra config values as mappings
 2018-12-19 20:40:51 +01:00
N
322dc97763
shutup cmd.run (its debug by default) 2018-12-18 21:50:37 +00:00
N
5570b6c072
Move some defaults from pillar.example to defaults 2018-12-18 21:42:28 +00:00
Heinz Wiesinger
549c73c739 Fix support for extra config values as mappings 2018-11-12 17:54:11 +01:00
Niels Abspoel
ed9a1b1814
Merge pull request #382 from msciciel/fileserver-list-cache-time 
Support fileserver_list_cache_time in master configuration
 2018-09-20 21:19:43 +02:00
N
8a6badf714 Stop noise from 'test -e' check' 2018-09-18 22:35:38 +01:00
Krzysztof Pawłowski
f43cc94362 Support fileserver_list_cache_time in master configuration 2018-08-09 09:06:00 +02:00
Johannes Löthberg
ec33ba5fab Add support for file external_auth special directives 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2018-08-06 10:26:17 +02:00
Alexandre Anriot
3e6e6028ae Support publisher_acl minion-level commands 2018-07-11 14:36:41 +02:00
Niels Abspoel
d87d858a87
Merge pull request #378 from mrichar1/extra_config 
Handle other non-iterable values like int/float.
 2018-07-02 11:12:05 +02:00
Matthew Richardson
aff75ce8ac Handle other non-iterable values like int/float. 2018-07-01 22:09:34 +01:00
Niels Abspoel
a1a65ce1e9
Merge pull request #375 from mrichar1/extra_config 
Handle extra config where value is a list (minion)
 2018-06-29 17:06:50 +02:00
Matthew Richardson
1a5027ef8c Handle pillar params with child params. (#372) 2018-06-22 10:41:10 +02:00
Matthew Richardson
c363aa9e04 Handle extra config where value is a list. 2018-06-12 14:40:54 +01:00
ze42
2761d90626 minion: master_alive_interval: remove duplicate (#369) 
Remove commented version and associated comment, as we still have the same
option earlier in config with an other valid comment.
 2018-06-11 11:12:23 +02:00
myii
91b666c75f Improve limitations related to git.latest in salt.formulas (#239) 
* Ensure options for formulas `git.latest` are also based on defaults

* Prevent erroneous remote tracking branch modification by `salt.formulas` #238

* Allow multiple envs to use the same gitdir for `salt.formulas`

* Ensure `gitdir` original branch is checked out after formulas `git.latest`

* Fix erroneous comment re: merging in `salt` pillar
 2018-06-10 11:18:20 +02:00
Justin Riley
d2ceaab7dd only set master_alive_interval once (#368) 
closes #367
 2018-06-08 17:12:07 +02:00
Felix Russell
9f33d2afe1 [Minion] [returner] [Elasticsearch] Yaml read patch + example.pillar update (#359) 
* Minion/returner/elasticsearch yaml read fix.

* Improved the documentation for the elasticsearch returner
 2018-04-17 22:26:45 +02:00
Colin Stubbs
32d9a9467d Add MacOS support; fix Issue #352 (#363) 
* Add MacOS support; fix Issue #352

* On MacOS, only attempt download if condition

Add if salt_settings.install_packages to requisites for an attempt to download the minion package on MacOS

* Update example pillar for MacOS support

Describe how to use MacOS specific options

* Add MacOS notes

* Update README.rst

* Update README.rst
 2018-04-17 22:26:20 +02:00
Jerzy Drozdz
d1e4768cdb Quotation and ipv6 (#355) 
* Added quotration around globing rules
 2018-04-05 12:45:59 +02:00
Colin Stubbs
d40d869883
Add os_family default for gitpython on RedHat 
salt.gitfs.gitpython.install_from_source == False on RedHat
Not sure about other O/S'es as to what default value should be
 2018-04-01 21:52:29 +10:00
Colin Stubbs
275067afcf
Fix for issue #361 
Add quick sanity check at start of state, do not attempt to do anything unless salt.gitfs.gitpython exists to check for install_from_source within
 2018-04-01 21:50:19 +10:00
Niels Abspoel
3c731605cc fix iteritems python3 2018-03-06 20:52:04 +01:00
Niels Abspoel
fd96c7a65a
Merge pull request #357 from Zero-Down-Time/master 
Add profile support to engine.conf to support sqs_events, bugfix for pillar defaults
 2018-02-02 16:49:29 +01:00
Iustina
6027df00a4 Add configuration for packages version 2018-02-01 18:31:35 +02:00
Stefan Reimer
e92f6f80b0 Fix default value to match array type of pillar 2018-01-30 12:57:31 -08:00
Stefan Reimer
334d5de72b Support profiles within engine.conf to be able to configure sqs_events, https://docs.saltstack.com/en/latest/ref/engines/all/salt.engines.sqs_events.html 2018-01-29 12:28:48 -08:00
Colin Stubbs
32f3104dbe Missing single quote 2018-01-06 23:22:57 +10:00
Colin Stubbs
4307b8ee65 Add pkg source default options for MacOS 2018-01-06 23:21:15 +10:00
Colin Stubbs
532b306b4e Add initial basis for proper MacOS support 2018-01-06 22:54:57 +10:00
Colin Stubbs
996aa78a8b pillar example is incorrect; map.jinja incorrectly names package for windows 2018-01-06 22:21:02 +10:00
Jorge Schrauwen
71e08ab599
Set correct api_service for SmartOS 
On SmartOS the salt-api daemon is started by the salt:api service.
 2017-12-23 22:23:53 +01:00
Niels Abspoel
31e2d95203
Merge pull request #339 from dafyddj/win-restart 
Fix Windows minion restart command
 2017-12-23 11:41:06 +01:00
Niels Abspoel
24998a4a0b
Merge pull request #332 from mchugh19/indenting 
peer run space and jason to yaml
 2017-11-21 11:33:06 +01:00
Theo Chatzimichos
fa657a850e add also default git values for SUSE osfamily (#344) 
they get overwritten from defaults.yaml if not specified
 2017-11-21 00:18:22 +01:00
Theo Chatzimichos
3fd9b0964d add default values for SUSE osfamily (#343) 2017-11-20 23:34:09 +01:00
Dafydd Jones
d987901db2 fix windows minion restart command 2017-10-16 17:09:19 +01:00
Alexandre Gomes
01564c3753 Change cmd.wait to cmd.run (#336) 
Changing cmd.wait to cmd.run as recomended on the documentation: https://docs.saltstack.com/en/latest/ref/states/all/salt.states.cmd.html#salt.states.cmd.wait
 2017-10-01 20:22:11 +02:00
Andrew Ernst
9ef5335f7b Update f_defaults.conf to support elasticsearch returner (#335) 
Proposed pull request for elasticsearch returner in the minion.d/f_defaults.conf file
 2017-09-29 22:13:00 +02:00
Gilles Dartiguelongue
3c88ad9918 Add pyinotify entry for Gentoo, refs #331 2017-09-11 14:32:47 +02:00
Niels Abspoel
413a2eae30 Merge pull request #331 from chessclub/fix-inotify-beacon-dependency 
Added support for installing pyinotify when using inotify beacons
 2017-08-29 00:12:13 +02:00
Christian McHugh
d5c10f5600 fix indenting around peer run. Convert extra configs from json to yaml 2017-08-28 07:04:43 +01:00
Tibold
80a160a810 Added default pyinotify package name for archlinux. 2017-08-16 07:20:00 +00:00
Tibold
e94f15d0fe Added support for installing pynotify when inotify beacons are configuredwq 2017-08-15 20:48:15 +00:00
Niels Abspoel
e2973c644d fix iteritems() with items() 2017-08-14 13:15:30 +02:00
Niels Abspoel
d6389b8a24 Merge pull request #313 from iondulgheru/master 
Fix master_tops configuration rendering
 2017-08-13 22:38:48 +02:00
mechleg
e8ef3c1446 adding salt-minion restart option from official FAQ page 2017-07-27 13:15:21 -07:00
Niels Abspoel
9cf5cd2c00 Merge pull request #319 from genuss/restart_via_at 
Add restart minion via at (fixes #136)
 2017-07-26 21:45:25 +02:00
Niels Abspoel
c265206e94 Merge pull request #323 from aquto/master 
Enable option to set minion scheduler
 2017-07-25 16:37:25 +02:00
Elliot Chen
ec8241c6fd Added minion scheduler configuration 2017-07-25 10:13:51 -04:00
Matthew Parlette
4437f7b2e1 Fixed map.jinja to work with 2017.7.0 2017-07-18 16:18:44 -04:00
Theo Chatzimichos
27c69a8a93
enable the syndic service 2017-06-29 13:05:15 +02:00
Florian Ermisch
739be9550f Merge pull request #316 from cmclaughlin/remove-env-comments 
Remove "source" comments from Saltify configs
 2017-06-16 12:17:20 +02:00
a.genus
0e8573d13a Fix typo 2017-06-15 13:30:30 +03:00
a.genus
22ad7db7c0 Add restart minion via at (fixes #136) 2017-06-14 19:28:11 +03:00
Javier Bértoli
b8273b9c3f Fix lists join error (#317) 2017-06-09 08:34:55 -03:00
Charles McLaughlin
3a261c7da0 Update comment for consistency 2017-06-07 14:55:25 -07:00
Charles McLaughlin
316622ef9b Remove "source" comments from Saltify configs 
I use Salt environments to provide each of my team mates the ability to develop
and test their Salt changes. And I've found that when we run this formula from
our environments against our salt-master, comments in some files change. For us
this represents an unwanted and unplanned change. I understand the intention -
to identify how or why the file changed, but I firmly believe that we should
be able to run highstsate with test=True and only see intended changes. Here's
an example:

            ID: salt-cloud-providers
      Function: file.recurse
          Name: /etc/salt/cloud.providers.d
        Result: None
       Comment: #### /etc/salt/cloud.providers.d/saltify.conf ####
                The file /etc/salt/cloud.providers.d/saltify.conf is set to be changed
       Started: 20:01:28.586441
      Duration: 75.185 ms
       Changes:
                ----------
                /etc/salt/cloud.providers.d/saltify.conf:
                    ----------
                    diff:
                        ---
                        +++
                        @@ -1,4 +1,4 @@
                        -# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=myenv
                        +# This file is managed by Salt via salt://salt/files/cloud.providers.d/saltify.conf?saltenv=dev

                         saltify:
                           provider: saltify
 2017-06-07 13:39:35 -07:00
Niels Abspoel
83433c8dd8 Merge pull request #312 from netmanagers/master 
Allow to specify reactors separatedly for master and minions
 2017-06-03 19:28:05 +02:00
Carpentier Pierre-Francois
5c3dc73f2a fix map.jinja 
add missing comas
 2017-05-31 22:53:48 +02:00
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.
 2017-05-30 09:18:54 +02:00
Ion Dulgheru
165f2d727c Fix master_tops configuration rendering 2017-05-24 18:31:36 +03:00
Javier Bértoli
9331997269 Exclude reactors from f_defaults.conf 2017-05-22 20:56:13 -03:00
Javier Bértoli
561eb4c5c8 Reactors should be in an array 2017-05-22 19:34:31 -03:00
Javier Bértoli
442806ab9e Allow to specify different reactors for minions and masters 2017-05-22 19:20:36 -03:00
Heinz Wiesinger
68a2b72519 Fix rendering of external_auth config. 
This now properly also supports per user, per minion as well as
function argument limiting.
 2017-05-09 13:34:44 +02: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
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
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
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
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
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