2
0
Commit Graph

1015 Commits

Author SHA1 Message Date
Imran Iqbal
0f725810c8
Merge pull request #492 from dth202/defaults-patch-1
fix(Defaults) master_type: str
2021-09-04 21:44:44 +01:00
Imran Iqbal
c16e7a3b75
test(_mapdata): update verification files for master_type: str
Use the following command:

```
$ GREP_SED="^\(\s\+master_type: \)true" \
  && grep -rl "${GREP_SED}" test/integration/ \
  | xargs sed -i -e "/${GREP_SED}/s//\1str/"
```
2021-09-04 21:27:44 +01:00
noelmcloughlin
8fa064baa9
ci(pillar): update master_type in pillar.example 2021-09-04 21:27:44 +01:00
Dallas Harris
ca1df1b69e
fix(default): set salt:minion:master_type to str
Having it set as true causes an error with the minion config when the salt-minion starts
2021-09-04 21:27:43 +01:00
Imran Iqbal
f64197ada4
test(pkgs_spec): fix latest rubocop violations [skip ci]
```
Offenses:

test/integration/v3000-py2/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3000-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3001-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3002-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^
test/integration/v3003-py3/controls/pkgs_spec.rb:10:5: C: [Correctable]
Style/WordArray: Use ['Salt Minion'] for an array of words.
(https://rubystyle.guide#percent-w)
    %w[Salt\ Minion]
    ^^^^^^^^^^^^^^^^

19 files inspected, 5 offenses detected, 5 offenses auto-correctable
```
2021-09-04 21:27:31 +01:00
Imran Iqbal
bd3458837b
chore(gemfile.lock): update to latest gem versions (2021-W35) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/364
2021-08-30 18:11:31 +01:00
Imran Iqbal
97a6cdc8ca
chore(gemfile.lock): update to latest gem versions (2021-W34) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/362
2021-08-23 09:25:46 +01:00
Imran Iqbal
86b0fa1d40
ci(kitchen+ci): update with latest 3003.2 pre-salted images [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/360
2021-08-19 10:14:50 +01:00
Imran Iqbal
42d64870e3
test(_mapdata): add AlmaLinux verification file [skip ci] 2021-08-19 08:12:07 +01:00
Imran Iqbal
5a93443656
chore(gemfile.lock): update to latest gem versions (2021-W33) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/359
2021-08-16 18:25:34 +01:00
Imran Iqbal
ed0bea8ea0
chore(gemfile.lock): update to latest gem versions (2021-W32) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/358
2021-08-09 12:16:21 +01:00
Imran Iqbal
a86e19e794
ci(gemfile+lock): use ssf customised inspec repo [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/357
2021-08-04 21:56:41 +01:00
Imran Iqbal
4e278f3b60
chore(gemfile.lock): update to latest gem versions (2021-W31) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/356
2021-08-04 21:39:25 +01:00
Imran Iqbal
06ab4d1f3e
chore(gemfile.lock): update to latest gem versions (2021-W30) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/353
2021-07-26 14:31:10 +01:00
Imran Iqbal
0231e6368e
ci(freebsd): update with latest pre-salted Vagrant boxes [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/350
2021-07-22 08:36:27 +01:00
Imran Iqbal
68f69e5f32
chore(gemfile.lock): update to latest gem versions (2021-W29) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/349
2021-07-21 18:33:52 +01:00
Imran Iqbal
ac1d3b9a2d
ci: add Debian 11 Bullseye & update yamllint configuration [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/345
2021-07-18 19:05:11 +01:00
Imran Iqbal
5cc8759efd
ci(kitchen): move provisioner block & update run_command [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/344
2021-07-17 21:12:34 +01:00
Imran Iqbal
cf74ad359f
chore(gemfile+lock): update to latest gem versions (2021-W28) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/343
2021-07-17 20:29:57 +01:00
semantic-release-bot
6c4f4b16cb chore(release): 1.9.0 [skip ci]
# [1.9.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.5...v1.9.0) (2021-07-14)

### Continuous Integration

* **3003.1:** update inc. AlmaLinux, Rocky & `rst-lint` [skip ci] ([0e62858](0e62858986))
* **kitchen.vagrant.yml:** disable FreeBSD until pre-salted boxes updated ([fa820c7](fa820c7839))
* **kitchen+gitlab:** remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci] ([226a187](226a187258))

### Documentation

* **readme:** add documentation regarding salt.formula usage [skip ci] ([209575f](209575f385))

### Features

* **freebsd:** update packages from `py37-*` => `py38-*` ([0ab42d7](0ab42d7ce8))
2021-07-14 16:33:22 +00:00
Imran Iqbal
54e91cc3bd
Merge pull request #511 from myii/feat/update-FreeBSD-pkgs-to-py38
feat(freebsd): update packages from `py37-*` => `py38-*`
2021-07-14 17:27:32 +01:00
Imran Iqbal
fa820c7839
ci(kitchen.vagrant.yml): disable FreeBSD until pre-salted boxes updated
* Automated using https://github.com/myii/ssf-formula/pull/341
2021-07-14 14:42:42 +01:00
Imran Iqbal
0ab42d7ce8
feat(freebsd): update packages from py37-* => py38-* 2021-07-14 14:42:28 +01:00
Imran Iqbal
6d318460f5
chore(deps): bump addressable from 2.7.0 to 2.8.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/340
2021-07-14 12:16:23 +01:00
Imran Iqbal
0e62858986
ci(3003.1): update inc. AlmaLinux, Rocky & rst-lint [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/335
2021-07-02 00:07:43 +01:00
Imran Iqbal
226a187258
ci(kitchen+gitlab): remove Ubuntu 16.04 & Fedora 32 (EOL) [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/331
2021-06-21 20:48:30 +01:00
Pedro Worcel
209575f385
docs(readme): add documentation regarding salt.formula usage [skip ci]
* docs(readme): add documentation regarding salt.formula usage.

* docs(readme): change salt.formulas documentation to use double backtick.

Co-authored-by: Imran Iqbal <myii@users.noreply.github.com>
2021-06-02 16:02:19 +01:00
semantic-release-bot
1399ccbb6e chore(release): 1.8.5 [skip ci]
## [1.8.5](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.4...v1.8.5) (2021-05-25)

### Bug Fixes

* **oracle-7:** use `osmajorrelease` instead of `$releasever` ([5146c44](5146c449d5))
* **repo:** update repo urls to `repo.saltproject.io` ([80542ba](80542bad6e))

### Continuous Integration

* **vagrant:** add OpenBSD 6.9 [skip ci] ([374527b](374527b235))
* add `arch-master` to matrix and update `.travis.yml` [skip ci] ([b867733](b8677339cc))
* **gitlab-ci:** update Fedora testing after release [skip ci] ([33d6a03](33d6a033d3))
2021-05-25 20:44:25 +00:00
Imran Iqbal
d1a83c6643
Merge pull request #506 from myii/fix/update-repo-urls-to-saltproject.io
fix(repo): update repo urls to `repo.saltproject.io` (inc. fix for `oraclelinux-7`)
2021-05-25 21:26:25 +01:00
Imran Iqbal
5146c449d5
fix(oracle-7): use osmajorrelease instead of $releasever
Avoid this error:

```
      ID: salt-master
Function: pkg.installed
  Result: False
 Comment: Error occurred installing package(s). Additional info follows:

   errors:
       - Running scope as unit run-402.scope.
         Loaded plugins: ovl, ulninfo
         https://repo.saltproject.io/py3/redhat/7Server/x86_64/3002/repodata/repomd.xml:
             [Errno 14] HTTPS Error 404 - Not Found
         Trying other mirror.
         No package salt-master available.
         Error: Nothing to do
```
2021-05-25 21:03:37 +01:00
Imran Iqbal
80542bad6e
fix(repo): update repo urls to repo.saltproject.io
Use the following command:

```
$ GREP_SED="\(repo\.salt\)stack\.com" \
  && grep -rl --exclude-dir=.git "${GREP_SED}" \
  | grep -v .un~$ \
  | xargs sed -i -e "/${GREP_SED}/s//\1project.io/g"
```
2021-05-25 19:27:15 +01:00
Imran Iqbal
374527b235
ci(vagrant): add OpenBSD 6.9 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/327
2021-05-23 08:28:22 +01:00
Imran Iqbal
eb13e826f6
chore(pre-commit): use info report level for rstcheck [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/325
2021-05-20 14:10:38 +01:00
Imran Iqbal
b8677339cc
ci: add arch-master to matrix and update .travis.yml [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/323
2021-05-09 22:33:53 +01:00
Imran Iqbal
33d6a033d3
ci(gitlab-ci): update Fedora testing after release [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/322
2021-04-30 06:14:02 +01:00
semantic-release-bot
ee14bb45fd chore(release): 1.8.4 [skip ci]
## [1.8.4](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.3...v1.8.4) (2021-04-24)

### Bug Fixes

* **freebsd:** use `retry_options` to avoid spurious service failures ([698b7ea](698b7eae59))
2021-04-24 16:16:05 +00:00
Imran Iqbal
65f9f27fc9
Merge pull request #505 from myii/fix/use-retry-options-for-all-services-on-freebsd
fix(freebsd): use `retry_options` to avoid spurious service failures
2021-04-24 17:09:12 +01:00
Imran Iqbal
698b7eae59
fix(freebsd): use retry_options to avoid spurious service failures
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).
2021-04-23 09:14:10 +01:00
semantic-release-bot
0e96047b16 chore(release): 1.8.3 [skip ci]
## [1.8.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.2...v1.8.3) (2021-04-22)

### Continuous Integration

* **kitchen+gitlab:** adjust matrix to add `3003` ([480b7ed](480b7edbfb))
* **vagrant:** add FreeBSD 13.0 [skip ci] ([6316991](6316991334))
* **vagrant:** add Windows 10 pre-salted box [skip ci] ([fd285d8](fd285d8c5b))

### Tests

* **aluminium:** add pillar, tests and verification files for `3003` ([752a1de](752a1dea22))
* **freebsd:** add `map.jinja` verification file (for 13.0) ([10ae613](10ae613cae))
2021-04-22 23:23:12 +00:00
Imran Iqbal
18839da929
Merge pull request #504 from myii/ci/add-3003
ci(kitchen+gitlab): adjust matrix to add `3003`
2021-04-23 00:17:15 +01:00
Imran Iqbal
480b7edbfb
ci(kitchen+gitlab): adjust matrix to add 3003
* Semi-automated using https://github.com/myii/ssf-formula/pull/318
2021-04-22 23:53:05 +01:00
Imran Iqbal
752a1dea22
test(aluminium): add pillar, tests and verification files for 3003 2021-04-22 08:52:57 +01:00
Imran Iqbal
6316991334
ci(vagrant): add FreeBSD 13.0 [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/316
2021-04-19 23:34:37 +01:00
Imran Iqbal
10ae613cae
test(freebsd): add map.jinja verification file (for 13.0) 2021-04-19 23:34:37 +01:00
Imran Iqbal
fd285d8c5b
ci(vagrant): add Windows 10 pre-salted box [skip ci]
* Semi-automated using https://github.com/myii/ssf-formula/pull/313
* Add Window 10 map verification file
2021-04-14 08:24:30 +01:00
semantic-release-bot
ff31dfb18e chore(release): 1.8.2 [skip ci]
## [1.8.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.8.1...v1.8.2) (2021-04-09)

### Bug Fixes

* **freebsd:** fix package names [skip ci] ([a30f124](a30f124485))

### Continuous Integration

* **vagrant:** use pre-salted boxes & conditional local settings [skip ci] ([5941618](5941618c6e))

### Tests

* **freebsd-11:** fix `osfinger` in comment [skip ci] ([26f2cc1](26f2cc1ef0))
2021-04-09 14:14:36 +00:00
Raphaël Hertzog
97299983ba
Ensure consistent ordering of module_config entries
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...
2021-04-09 16:02:36 +02:00
Imran Iqbal
5941618c6e
ci(vagrant): use pre-salted boxes & conditional local settings [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/311
2021-04-05 18:54:57 +01:00
Imran Iqbal
157e566008
chore: update CODEOWNERS & .yamllint re: kitchen-vagrant [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/310
2021-04-05 18:21:48 +01:00
Imran Iqbal
a30f124485
fix(freebsd): fix package names [skip ci]
Resolves issues introduced in 24ebbb4e0c.
2021-04-04 15:41:53 +01:00