Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity
781 Commits 3 Branches 68 Tags 2.4 MiB
Commit Graph

781 Commits

Author SHA1 Message Date
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
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
Niels Abspoel b615ca077a Merge pull request #333 from EvaSDK/gentoo-pyinotify 
Add pyinotify entry for Gentoo, refs #331
 2017-09-11 15:34:09 +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
Niels Abspoel 228f74b660 Merge pull request #330 from aboe76/fix_deprecated_iteritems 
fix #296 deprecated iteritems() and replace it with items()
 2017-08-29 00:11:12 +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
Niels Abspoel 8ad2bb6a80 Merge pull request #325 from mechleg/minion-restart 
adding salt-minion restart option from official FAQ page
 2017-08-08 22:23:23 +02:00
Niels Abspoel 3d8f2f6c42 Merge pull request #328 from saltstack-formulas/fix-pillar-example 
Corrected salt:release in pillar.example
 2017-08-07 20:15:12 +02:00
Alexander Weidinger 7e8df76e28 Corrected salt:release in pillar.example 
Fixes 'TypeError: coercing to Unicode: need string or buffer, float found'
 2017-08-07 17:49:44 +02:00
Niels Abspoel e307b0cd53 Merge pull request #327 from arthurlogilab/patch-2 
[pillar.example] fix indentation of reactors examples
 2017-08-04 14:04:15 +02:00
Arthur Lutz 0467074e28 [pillar.example] fix indentation of reactors examples 2017-08-04 11:44:06 +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