Commit Graph

670 Commits

Author SHA1 Message Date
Imran Iqbal 922135df31 Improve reformating of `formulas.sls` Jinja 2019-02-15 04:28:51 +00:00
Imran Iqbal f76364c1b7 Reformat `formulas.sls` Jinja to make it easier to work with 2019-02-15 01:33:18 +00:00
Niels Abspoel 5aad03cf69 add autogenerated AUTHORS.md 2019-02-13 21:38:17 +01:00
Niels Abspoel 20e893bec9
Merge pull request #401 from dafyddj/use-os_family-for-pkgrepo
Make pkgrepo work for Debian derivatives without their own repos
2019-02-11 21:36:08 +01:00
Dafydd Jones a0e0a65e18 osfamily map: make pkgrepo work for Debian derivatives without their own repos
e.g. TurnKey Linux amongst others
2019-02-11 16:55:21 +00:00
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
Niels Abspoel 698085f758
Merge pull request #396 from myii/PR_fix-lookup-regression
Fix `salt:lookup` regression
2019-01-29 20:29: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
Imran Iqbal 1d9643b14b
Merge pull request #395 from aboe76/simplify-map.jinja
Simplify map.jinja revert deep_merge solution from #193
2019-01-26 21:54:08 +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
Niels Abspoel 44b06d70b7
Merge pull request #394 from myii/PR_364-archive-dir-for-minor-release
Fix `repo.saltstack.com` URLs for pinned minor release (#364)
2019-01-25 20:12:05 +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
Niels Abspoel d2668a03cf
Merge pull request #393 from Thor77/fix-arch-gitpython
Add missing GitPython-package for Arch
2019-01-05 15:33:32 +01:00
Thor77 ff34b1f8a4
Add missing GitPython-package for Arch 2019-01-05 12:06:54 +01:00
N d370f88d2c
Merge pull request #392 from aboe76/travis_integration
add initial travis integration
2018-12-22 16:33:45 +00:00
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