2
0
Commit Graph

789 Commits

Author SHA1 Message Date
Imran Iqbal
7cec4c0bb3
Merge pull request #409 from alxwr/fix-raspbian
osmap: Raspbian used the Debian repo
2019-04-24 00:44:23 +01:00
Alexander Weidinger
0433114083 osmap: Raspbian used the Debian repo 2019-04-24 01:15:51 +02:00
Javier Bértoli
0c0eca2983
Merge pull request #414 from myii/bug/use-py2-centos-7
ci(kitchen+travis): use `py2` instead of `py3` for `centos-7`
2019-04-19 16:00:53 -03:00
Imran Iqbal
071942061d
ci(kitchen+travis): use py2 instead of py3 for centos-7 2019-04-19 19:03:54 +01:00
Niels Abspoel
0ba5261e1b
Merge pull request #412 from myii/bug/fix-windows-py3
fix(windows): use correct `salt-minion` package name
2019-04-19 15:29:30 +02:00
Imran Iqbal
1f0cefdb78
fix(windows): use correct salt-minion package name
* From `salt-winrepo-ng`:
  + https://github.com/saltstack/salt-winrepo-ng/blob/master/salt-minion-py2.sls
    - Package: `salt-minion`
  + https://github.com/saltstack/salt-winrepo-ng/blob/master/salt-minion-py3.sls
    - Package: `salt-minion-py3`
* Close #411
2019-04-18 07:16:56 +01:00
Imran Iqbal
f5ab70e90b
refactor(osfamilymap): rename py_ver_dir since not only for dirs
* Prepare for selecting correct version of Windows `salt-minion` pkg
2019-04-18 07:05:37 +01:00
Niels Abspoel
b07e0cf9d4
Merge pull request #413 from myii/bug/revert-to-resolve-403
Fix regression #403
2019-04-17 10:53:13 +02:00
Imran Iqbal
ab765e3305
Revert "shutup debug output from unless"
This reverts commit 2a0f4617db.

* Close #403
2019-04-16 23:57:20 +01:00
Imran Iqbal
683f45579d
Merge pull request #406 from netmanagers/master
Update the testing matrix (5 distros, 2 python versions, 3 salt versions)
2019-04-02 07:08:21 +01:00
Javier Bértoli
4231029c62 Changed Redhat's repo name and file
To match the one used by the bootstrapper. Otherwhise, we end up with two repos configured
2019-04-01 09:50:27 -03:00
Javier Bértoli
79109b98f0 Try to make centos-6 work 2019-03-31 19:26:59 -03:00
Javier Bértoli
5ffc1e5bc1 Bootstrap using git, so versions don't collide at package install time. 2019-03-31 16:26:52 -03:00
Javier Bértoli
2e1d4c4573 Specify dependencies 2019-03-31 13:02:13 -03:00
Javier Bértoli
9f9bd97f9e We don't need the daemons running at bootstrap time 2019-03-31 12:30:41 -03:00
Javier Bértoli
f494b59fe1 Fix test repo dir, try to get centos-6 working 2019-03-31 12:01:55 -03:00
Javier Bértoli
b2d760cd87 Update the testing matrix to cover most distro+salt+python combinations
Use py3 for latest salt version
Use Python 2 on old distros
Update Gemfile
Updated centos-6 run_command, as it does not use systemd
Added tests to verify correct package versions for all cases tested
2019-03-31 11:44:44 -03:00
Niels Abspoel
764d9eef6d
Merge pull request #402 from aboe76/authors/wip
add autogenerated AUTHORS.md
2019-02-15 21:15:37 +01:00
Niels Abspoel
9940319ea2
Merge pull request #404 from myii/PR_reformat-jinja
Reformat `formulas.sls` Jinja to make it easier to work with
2019-02-15 21:15:00 +01:00
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