2
0
Commit Graph

488 Commits

Author SHA1 Message Date
N
8875b93eb7 chore(pr): adopt pr comments; indent jinja 2020-06-13 21:11:28 +01:00
N
419352f6ce Merge branch 'master' of https://github.com/saltstack-formulas/salt-formula into macos 2020-06-13 20:33:36 +01:00
N
3920ed3bd4
Merge branch 'master' into macos 2020-06-01 01:15:32 +01:00
N
4d901b94d1 Merge branch 'master' into macos 2020-06-01 01:08:54 +01:00
Imran Iqbal
5d9a92bf1d
fix(opensuse): use appropriate upstream repo 2020-05-26 03:46:55 +01:00
Imran Iqbal
ed20b2662f
Merge pull request #458 from hatifnatt/feat-apt-pinning
feat(package): use apt-pinning to pin specific package version
2020-04-18 12:17:11 +01:00
Heinz Wiesinger
02fbcd43fc
fix(api): remove spurious colon in salt.api state 2020-04-03 10:07:46 +01:00
Imran Iqbal
0da366c7b2
refactor(osfamilymap): remove workaround for OpenSUSE 15.1 2020-03-21 00:22:22 +00:00
Imran Iqbal
7551ba5b0e
Merge pull request #460 from noelmcloughlin/version_cmp
fix(jinja): replace version_cmp with grains lookup
2020-03-19 13:23:59 +00:00
N
dd37869d28
fix(jinja): replace version_cmp with grains lookup 2020-03-19 13:16:00 +00:00
N
325f6c061b
fix(jinja): replace version_cmp with grains lookup 2020-03-19 12:45:35 +00:00
hatifnatt
98ad87a001 feat(package): use apt-pinning to pin specific package version
Available only on Debian family OS-es
2020-03-18 22:49:28 +03:00
Imran Iqbal
10e8778647
Merge pull request #453 from cr1st1p/allow-disable-services
Allow disabling services or just ignoring them.
2020-03-11 07:10:33 +00:00
cristi
29ffd68d34 feat(mapping): better control of the service's state
Instead of the default service.running + enabled, you can control
the actual state, via pillar.
And you can even say 'state = ignore' and no state will be generated
to control the service
2020-02-20 18:44:04 +02:00
N
fbaa456ca6
feat(metastate): add metastate per community convention 2020-02-18 13:34:38 +00:00
Imran Iqbal
4955737f84 fix(libtofs): “files_switch” mess up the variable exported by “map.jinja” [skip ci]
* Checked using https://github.com/myii/ssf-formula/pull/131
2020-02-14 19:11:08 +00:00
sticky-note
bbcc4cda7a fix(tpl_path): replace slspath to tplroot 2020-02-13 09:43:25 +11:00
N
7fdbb84b4f
Merge pull request #449 from noelmcloughlin/hardcoding2
feat(mapping): simplify py version handling, less jinja
2020-01-26 00:41:05 +01:00
N
715e3b8fa4
refactor(mapping): simplify py version handling 2020-01-25 18:06:29 +00:00
N
efc5d7c632
Merge branch 'master' into macos 2020-01-25 19:02:42 +01:00
N
698d6ae3af
chore(cleanup): delete unused directory 2020-01-24 00:56:52 +00:00
N
e5317d8c30
Merge branch 'master' into macos 2020-01-22 16:57:15 +01:00
N
94027f7332
feat(macos): basic launchctl service support 2020-01-22 15:55:42 +00:00
nb
eda88bd1a6 feat(formulas): git.latest parallelization 2019-12-18 11:30:37 +11:00
nb
9362277f2a feat(per-formula-opts): configure git.latest state per formula 2019-12-04 09:48:35 +11:00
Imran Iqbal
ef4ad1ec5c
fix(syndic.sls): fix salt-lint errors
```bash
Examining salt/syndic.sls of type state
[201] Trailing whitespace
salt/syndic.sls:12
  {%- endif %}
```
2019-10-09 18:34:13 +01:00
Imran Iqbal
3e6397788f
fix(minion.sls): fix salt-lint errors
```bash
Examining salt/minion.sls of type state
[210] Numbers that start with `0` should always be encapsulated in quotation marks
salt/minion.sls:20
    - mode: 0644
```
2019-10-09 18:34:12 +01:00
Imran Iqbal
5b348eb354
fix(map.jinja): fix salt-lint errors
```bash
Examining salt/map.jinja of type state
[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:4
{## Start imports ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:21
{## Merge in salt pillar ##}

[209] Jinja comment should have spaces before and after: {# comment #}
salt/map.jinja:24
{## Merge in salt_formulas pillar ##}
```
2019-10-09 18:34:12 +01:00
N
356035d8f8
Merge pull request #437 from sticky-note/fix/symlinks
fix(symlinks): replace symlinks with real files
2019-09-21 00:22:40 +02:00
sticky-note
c4d013260f fix(symlinks): replace symlinks with real files 2019-09-20 11:02:21 +11:00
Imran Iqbal
cb726afb10
fix(pkgrepo): provide settings for amazon 2019-09-19 01:57:12 +01:00
Imran Iqbal
f00c9a796a
fix(pkgrepo): fix settings for opensuse 2019-09-19 01:53:31 +01:00
Imran Iqbal
ebfeba2c4f
feat: use semantic-release cross-formula standard structure
* Semi-automated using https://github.com/myii/ssf-formula/pull/31
* Includes:
  - Update TOFS
  - Use `bin/kitchen`
  - Use `dist: bionic` in Travis
  - Add `yamllint` and apply rules
  - Use `pillars_from_files` throughout
  - Replace EOL images in Kitchen & Travis
  - Add `develop` images in Kitchen & Travis
* Fix (or ignore)  errors shown below:

```bash
salt-formula$ yamllint -s .
./pillar.example
  1:1       warning  missing document start "---"  (document-start)
  5:23      warning  truthy value should be one of [false, true]  (truthy)
  8:25      warning  truthy value should be one of [false, true]  (truthy)
  11:25     warning  truthy value should be one of [false, true]  (truthy)
  19:21     warning  truthy value should be one of [false, true]  (truthy)
  40:89     error    line too long (108 > 88 characters)  (line-length)
  41:89     error    line too long (112 > 88 characters)  (line-length)
  43:89     error    line too long (112 > 88 characters)  (line-length)
  45:89     error    line too long (110 > 88 characters)  (line-length)
  47:89     error    line too long (89 > 88 characters)  (line-length)
  74:27     warning  truthy value should be one of [false, true]  (truthy)
  82:9      error    wrong indentation: expected 10 but found 8  (indentation)
  101:14    warning  truthy value should be one of [false, true]  (truthy)
  102:20    warning  truthy value should be one of [false, true]  (truthy)
  103:89    error    line too long (119 > 88 characters)  (line-length)
  121:7     warning  comment not indented like content  (comments-indentation)
  122:24    error    syntax error: found character '%' that cannot start any token
  310:89    error    line too long (102 > 88 characters)  (line-length)
  330:89    error    line too long (113 > 88 characters)  (line-length)
  433:1     error    too many blank lines (1 > 0)  (empty-lines)

./salt/osmap.yaml
  4:2       error    syntax error: found character '%' that cannot start any token
  6:89      error    line too long (93 > 88 characters)  (line-length)
  22:89     error    line too long (137 > 88 characters)  (line-length)
  23:89     error    line too long (134 > 88 characters)  (line-length)
  33:89     error    line too long (149 > 88 characters)  (line-length)
  34:89     error    line too long (146 > 88 characters)  (line-length)

./salt/osfamilymap.yaml
  4:2       error    syntax error: found character '%' that cannot start any token
  6:89      error    line too long (94 > 88 characters)  (line-length)
  24:89     error    line too long (149 > 88 characters)  (line-length)
  25:89     error    line too long (146 > 88 characters)  (line-length)
  39:89     error    line too long (105 > 88 characters)  (line-length)
  40:89     error    line too long (127 > 88 characters)  (line-length)
  56:89     error    line too long (101 > 88 characters)  (line-length)

./salt/ospyvermap.yaml
  4:1       warning  missing document start "---"  (document-start)

./salt/defaults.yaml
  3:1       warning  missing document start "---"  (document-start)
  7:21      warning  truthy value should be one of [false, true]  (truthy)
  8:12      warning  truthy value should be one of [false, true]  (truthy)
  9:23      warning  truthy value should be one of [false, true]  (truthy)
  10:19     warning  truthy value should be one of [false, true]  (truthy)
  14:25     warning  truthy value should be one of [false, true]  (truthy)
  15:25     warning  truthy value should be one of [false, true]  (truthy)
  16:27     warning  truthy value should be one of [false, true]  (truthy)
  17:27     warning  truthy value should be one of [false, true]  (truthy)
  39:28     warning  truthy value should be one of [false, true]  (truthy)
  41:28     warning  truthy value should be one of [false, true]  (truthy)
  45:24     warning  truthy value should be one of [false, true]  (truthy)
  49:30     warning  truthy value should be one of [false, true]  (truthy)
  54:28     warning  truthy value should be one of [false, true]  (truthy)
  63:25     warning  truthy value should be one of [false, true]  (truthy)
  68:15     warning  truthy value should be one of [false, true]  (truthy)
```
2019-09-13 07:58:18 +01:00
nb
49bf81bc6e fix(minion): fix version compare in minion.sls 2019-08-26 09:11:48 +11:00
Ryan Walder
042e9baad3
Add 'return' to reserved_keys in minion config
This prevents the `return` key being duplicated in the minion config by L1205
2019-08-15 14:16:57 +01:00
N
2230465c40
Merge pull request #424 from noelmcloughlin/pkgrepo1
refactor(linux): align to template-formula & fixes
2019-08-02 13:04:01 +01:00
Niels Abspoel
cb0219d0ce
Merge pull request #425 from noelmcloughlin/pkgrepo2
fix(os): pass pkgrepo state on unsupported os
2019-08-01 20:32:05 +02:00
N
beb0e85b04
fix(perms): some os have custom user/root 2019-08-01 13:13:27 +01:00
N
14276e2074
fix(macos): fix minion package handling for homebrew 2019-08-01 01:31:02 +01:00
N
455797675c
fix(os): pass state on unsupported os 2019-07-30 00:12:59 +01:00
N
71b4d8abb8
refactor(linux): align to template-formula (plus fixes) 2019-07-29 23:52:13 +01:00
Imran Iqbal
fbe814ace8
feat(tofs): allow TOFS for minion configuration 2019-06-07 03:58:24 +01:00
Imran Iqbal
1b202afb29
feat(tofs): allow TOFS for master configuration 2019-06-07 03:58:24 +01:00
Imran Iqbal
61a93d8c1e
chore(tofs): prepare library and pillar.example 2019-06-07 03:58:06 +01:00
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
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
Imran Iqbal
ab765e3305
Revert "shutup debug output from unless"
This reverts commit 2a0f4617db.

* Close #403
2019-04-16 23:57:20 +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
2e1d4c4573 Specify dependencies 2019-03-31 13:02:13 -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
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
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
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