Use the `retry_options` already being used for the Salt minion service,
since we're getting failures such as this one:
* https://github.com/myii/salt-formula/runs/2415072504
This is made worse by the fact that GitHub Actions cannot re-run a
single job (at the current time).
Right now when you set module_config entries in your pillar data
like this:
salt:
minion:
module_config:
smtp.from: 'Kali Salt <admins+salt@kali.org>'
smtp.to: 'Kali Admins <admins+salt@kali.org>'
smtp.host: localhost
smtp.subject: 'Results of salt actions on'
smtp.fields: id,fun
On each run, you will always a different ordering of the various
fields in the minion configuration file, leading to spurious restart
of the minion and admin annoyance:
ID: salt-minion
Function: file.recurse
Name: /etc/salt/minion.d
Result: True
Comment: Recursively updated /etc/salt/minion.d
Started: 13:39:25.689775
Duration: 874.318 ms
Changes:
----------
/etc/salt/minion.d/f_defaults.conf:
----------
diff:
---
+++
@@ -930,10 +930,10 @@
# A dict for the test module:
#test.baz: {spam: sausage, cheese: bread}
#
+smtp.fields: id,fun
+smtp.from: Kali Salt <admins+salt@kali.org>
smtp.to: Kali Admins <admins+salt@kali.org>
-smtp.fields: id,fun
smtp.host: localhost
-smtp.from: Kali Salt <admins+salt@kali.org>
smtp.subject: Results of salt actions on
With the change here, this bad behaviour is gone...
## [1.8.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.0...v1.8.1) (2021-03-30)
### Bug Fixes
* **freebsd:** update to provide support for most recent versions ([24ebbb4](24ebbb4e0c))
* **openbsd:** update to provide support for most recent versions ([61201de](61201de8c6))
* **osfamilymap:** use `whoami` for Windows `rootuser` ([69d5981](69d598138e)), closes [#495](https://github.com/saltstack-formulas/salt-formula/issues/495)
### Code Refactoring
* **retry_options:** provide options from defaults/pillar ([bbd7286](bbd7286240))
### Continuous Integration
* enable Vagrant-based testing using GitHub Actions ([163c77f](163c77fcee))
* **kitchen+ci:** use latest pre-salted images (after CVE) [skip ci] ([cfefcc8](cfefcc83c0))
* **windows:** use `kitchen.windows.yml` ([c6043fb](c6043fbc9d))
### Documentation
* **readme:** add `Testing with Vagrant` section ([ef1bc02](ef1bc02a86))
### Tests
* update for new platforms (inc. using `system` library) ([e6bcdc1](e6bcdc1b4d))
* **_mapdata:** add Arch Linux verification file ([e31a56e](e31a56e7a3))
* add Windows map verification files ([e0afe89](e0afe89f24))
* standardise use of `share` suite & `_mapdata` state [skip ci] ([9816f47](9816f473c5))
Make the upstream salt package repository selectable, thus allowing the
use of archived salt versions (hosted in
https://archive.repo.saltproject.io), as well as custom salt versions
hosted in alternate repositories.
* CVE-2021-25283 enables Jinja2 safe mode, which breaks use of
`'dict' in x.__class__.__name__` workaround
* Workaround no longer needed as CentOS 6 is EOL
Use ugly `zypper lr --uri` hack to get around failure if the `base_url`
already exists under a different name:
```
ID: salt-pkgrepo-install-saltstack-suse
Function: pkgrepo.managed
Name: systemsmanagement_saltstack_products
Result: False
Comment: Failed to configure repo 'systemsmanagement_saltstack_products':
Repository 'systemsmanagement_saltstack_products' already exists as 'systemsmanagement_saltstack'.
Started: 09:28:39.154054
Duration: 2760.727 ms
```
Upstream code:
* 45cc49daed/salt/modules/zypperpkg.py (L1262-L1265)
