2
0
Commit Graph

602 Commits

Author SHA1 Message Date
Niels Abspoel
45394feb99 add initial travis integration
add travis button to README
2018-12-22 16:28:18 +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
Javier Bértoli
4bd33dcccd
Merge pull request #390 from noelmcloughlin/formula_defaults
Move some defaults from pillar.example to defaults
2018-12-19 06:49:57 -03: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
Niels Abspoel
4389c13520
Merge pull request #384 from noelmcloughlin/make_test_quiet
Stop noise from 'test -e' check'
2018-09-20 21:19:15 +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
Niels Abspoel
0383f20d9d
Merge pull request #379 from aanriot/master
Support publisher_acl minion-level commands
2018-07-11 20:35:12 +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
myii
784e2bc372 Update pillar.example for single-dir, multi-branch salt_formulas #239 (#373)
* Also minor unrelated updates/fixes
2018-06-11 20:38:58 +02: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
Niels Abspoel
dd731c643a
Merge pull request #362 from colin-stubbs/issue-361
Issue 361
2018-04-05 12:42:22 +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
Javier Bértoli
9a81ab2f9b
Merge pull request #360 from aboe76/python3_iter
fix iteritems python3
2018-03-06 18:33:44 -03: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
Javier Bértoli
fc202490a3
Merge pull request #358 from iustinam/pkgver
Add configuration for packages version
2018-02-01 13:50:01 -03: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
Niels Abspoel
b15ce1c73d
Merge pull request #351 from colin-stubbs/master
pillar.example is incorrect; package name for windows is incorrect #350
2018-01-06 15:27:37 +01: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
Niels Abspoel
8268d83dbe
Merge pull request #348 from sjorge/patch-1
Set correct api_service for SmartOS
2017-12-24 09:35:53 +01: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
d01083f347
Merge pull request #345 from Angelo-Verona/master
Changed pillar example formatting for Slack
2017-12-23 11:39:30 +01:00
Angelo Verona
c8e86c5d76 Changed formating in pillar example to avoid warning about wrong dictionary format from Salt. Added comment about type of token. 2017-12-08 02:18:10 +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