54 changed files with 1037 additions and 1815 deletions
--- a/.github/workflows/kitchen.macos.yml
+++ b/.github/workflows/kitchen.macos.yml
@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-name: 'Kitchen (macOS)'
-'on': ['push', 'pull_request']
-
-env:
-  KITCHEN_LOCAL_YAML: 'kitchen.macos.yml'
-
-jobs:
-  test-12:
-    runs-on: 'macos-12'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - default-macos-12-latest-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
-  test-11:
-    runs-on: 'macos-11'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - default-macos-11-latest-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
-  test-1015:
-    runs-on: 'macos-10.15'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - default-macos-1015-latest-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
--- a/.github/workflows/kitchen.vagrant.yml
+++ b/.github/workflows/kitchen.vagrant.yml
@ -15,10 +15,11 @@ jobs:
      matrix:
        instance:
          # - default-freebsd-130-master-py3
-          # - default-freebsd-123-master-py3
+          # - default-freebsd-122-master-py3
          - default-freebsd-130-3004-0-py3
-          - default-freebsd-123-3004-0-py3
+          - default-freebsd-122-3004-0-py3
          - default-openbsd-70-3003-3-py3
+          - default-openbsd-69-3002-6-py3
          - default-windows-10-latest-py3
          - default-windows-81-latest-py3
    steps:
--- a/.github/workflows/kitchen.windows.yml
+++ b/.github/workflows/kitchen.windows.yml
@ -11,48 +11,6 @@ env:
  KITCHEN_LOCAL_YAML: 'kitchen.windows.yml'

 jobs:
-  test-2022:
-    runs-on: 'windows-2022'
-    strategy:
-      fail-fast: false
-      matrix:
-        instance:
-          - default-windows-2022-latest-py3
-    steps:
-      - name: 'Check out code'
-        uses: 'actions/checkout@v2'
-      - name: 'Install Chef'
-        uses: 'actionshub/chef-install@1.1.0'
-        with:
-          project: 'chef'
-          version: '16.10.8'
-      - name: 'Add Chef bindir to PATH'
-        uses: 'myci-actions/export-env-var-powershell@1'
-        with:
-          name: 'PATH'
-          value: "C:\\opscode\\chef\\bin;\
-                  C:\\opscode\\chef\\embedded\\bin;$env:PATH"
-      - name: 'Set up Bundler cache'
-        uses: 'actions/cache@v1'
-        with:
-          path: 'vendor/bundle'
-          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
-          restore-keys: "${{ runner.os }}-gems-"
-      - name: 'Set up test user'
-        run: |
-          $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force
-          New-LocalUser $env:machine_user -Password $password
-          Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
-      - name: 'Set up WinRM'
-        run: |
-          Set-WSManQuickConfig -Force
-      - name: 'Run Bundler'
-        run: |
-          ruby --version
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: 'Run Test Kitchen'
-        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
  test-2019:
    runs-on: 'windows-2019'
    strategy:
@ -86,8 +44,54 @@ jobs:
          New-LocalUser $env:machine_user -Password $password
          Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
      - name: 'Set up WinRM'
-        run: |
-          Set-WSManQuickConfig -Force
+        run: >
+          Set-WSManQuickConfig -Force;
+          Set-WSManInstance -ResourceURI winrm/config/service
+          -ValueSet @{AllowUnencrypted="true"}
+      - name: 'Run Bundler'
+        run: |
+          ruby --version
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: 'Run Test Kitchen'
+        run: 'bundle exec kitchen verify ${{ matrix.instance }}'
+  test-2016:
+    runs-on: 'windows-2016'
+    strategy:
+      fail-fast: false
+      matrix:
+        instance:
+          - default-windows-2016-latest-py3
+    steps:
+      - name: 'Check out code'
+        uses: 'actions/checkout@v2'
+      - name: 'Install Chef'
+        uses: 'actionshub/chef-install@1.1.0'
+        with:
+          project: 'chef'
+          version: '16.10.8'
+      - name: 'Add Chef bindir to PATH'
+        uses: 'myci-actions/export-env-var-powershell@1'
+        with:
+          name: 'PATH'
+          value: "C:\\opscode\\chef\\bin;\
+                  C:\\opscode\\chef\\embedded\\bin;$env:PATH"
+      - name: 'Set up Bundler cache'
+        uses: 'actions/cache@v1'
+        with:
+          path: 'vendor/bundle'
+          key: "${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}"
+          restore-keys: "${{ runner.os }}-gems-"
+      - name: 'Set up test user'
+        run: |
+          $password = ConvertTo-SecureString $env:machine_pass -AsPlainText -Force
+          New-LocalUser $env:machine_user -Password $password
+          Add-LocalGroupMember -Group "Administrators" -Member $env:machine_user
+      - name: 'Set up WinRM'
+        run: >
+          Set-WSManQuickConfig -Force;
+          Set-WSManInstance -ResourceURI winrm/config/service
+          -ValueSet @{AllowUnencrypted="true"}
      - name: 'Run Bundler'
        run: |
          ruby --version
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -130,14 +130,13 @@ rubocop:
 ## Define the rest of the matrix based on Kitchen testing
 # Make sure the instances listed below match up with
 # the `platforms` defined in `kitchen.yml`
-# yamllint disable rule:line-length
 # default-debian-11-tiamat-py3: {extends: '.test_instance'}
 # default-debian-10-tiamat-py3: {extends: '.test_instance'}
 # default-debian-9-tiamat-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-tiamat-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
 # default-centos-stream8-tiamat-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-tiamat-py3: {extends: '.test_instance'}
 # default-centos-7-tiamat-py3: {extends: '.test_instance'}
 # default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
@ -147,14 +146,15 @@ rubocop:
 # default-debian-11-master-py3: {extends: '.test_instance'}
 # default-debian-10-master-py3: {extends: '.test_instance'}
 # default-debian-9-master-py3: {extends: '.test_instance'}
-# default-ubuntu-2204-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-ubuntu-2004-master-py3: {extends: '.test_instance'}
 # default-ubuntu-1804-master-py3: {extends: '.test_instance'}
 # default-centos-stream8-master-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-master-py3: {extends: '.test_instance'}
 # default-centos-7-master-py3: {extends: '.test_instance'}
-# default-fedora-36-master-py3: {extends: '.test_instance_failure_permitted'}
-# default-fedora-35-master-py3: {extends: '.test_instance'}
+# default-fedora-34-master-py3: {extends: '.test_instance'}
+# default-fedora-33-master-py3: {extends: '.test_instance'}
 # default-opensuse-leap-153-master-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
 # default-opensuse-tmbl-latest-master-py3: {extends: '.test_instance_failure_permitted'}
 # default-amazonlinux-2-master-py3: {extends: '.test_instance'}
 # default-oraclelinux-8-master-py3: {extends: '.test_instance'}
@ -164,37 +164,82 @@ rubocop:
 # default-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
 # default-almalinux-8-master-py3: {extends: '.test_instance'}
 # default-rockylinux-8-master-py3: {extends: '.test_instance'}
-default-debian-11-3004-1-py3: {extends: '.test_instance'}
-# default-debian-10-3004-1-py3: {extends: '.test_instance'}
-# default-debian-9-3004-1-py3: {extends: '.test_instance'}
-default-ubuntu-2204-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-default-ubuntu-2004-3004-1-py3: {extends: '.test_instance'}
-# default-ubuntu-1804-3004-1-py3: {extends: '.test_instance'}
-default-centos-stream8-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-# default-centos-7-3004-1-py3: {extends: '.test_instance'}
-default-fedora-36-3004-1-py3: {extends: '.test_instance_failure_permitted'}
-default-fedora-35-3004-1-py3: {extends: '.test_instance'}
-default-amazonlinux-2-3004-1-py3: {extends: '.test_instance'}
-default-oraclelinux-8-3004-1-py3: {extends: '.test_instance'}
-# default-oraclelinux-7-3004-1-py3: {extends: '.test_instance'}
-default-arch-base-latest-3004-1-py3: {extends: '.test_instance'}
-default-gentoo-stage3-latest-3004-1-py3: {extends: '.test_instance'}
-default-gentoo-stage3-systemd-3004-1-py3: {extends: '.test_instance'}
-default-almalinux-8-3004-1-py3: {extends: '.test_instance'}
-default-rockylinux-8-3004-1-py3: {extends: '.test_instance'}
-default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
-default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
-default-debian-10-3003-4-py3: {extends: '.test_instance'}
-default-debian-9-3003-4-py3: {extends: '.test_instance'}
-# default-ubuntu-2004-3003-4-py3: {extends: '.test_instance'}
-default-ubuntu-1804-3003-4-py3: {extends: '.test_instance'}
-# default-centos-stream8-3003-4-py3: {extends: '.test_instance_failure_permitted'}
-default-centos-7-3003-4-py3: {extends: '.test_instance'}
-# default-amazonlinux-2-3003-4-py3: {extends: '.test_instance'}
-# default-oraclelinux-8-3003-4-py3: {extends: '.test_instance'}
-default-oraclelinux-7-3003-4-py3: {extends: '.test_instance'}
-# default-almalinux-8-3003-4-py3: {extends: '.test_instance'}
-# yamllint enable rule:line-length
+default-debian-11-3004-0-py3: {extends: '.test_instance'}
+# default-debian-10-3004-0-py3: {extends: '.test_instance'}
+# default-debian-9-3004-0-py3: {extends: '.test_instance'}
+default-ubuntu-2004-3004-0-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3004-0-py3: {extends: '.test_instance'}
+default-centos-stream8-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+default-centos-8-3004-0-py3: {extends: '.test_instance'}
+# default-centos-7-3004-0-py3: {extends: '.test_instance'}
+# default-fedora-34-3004-0-py3: {extends: '.test_instance'}
+# default-fedora-33-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3004-0-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3004-0-py3: {extends: '.test_instance_failure_permitted'}
+default-amazonlinux-2-3004-0-py3: {extends: '.test_instance'}
+default-oraclelinux-8-3004-0-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3004-0-py3: {extends: '.test_instance'}
+default-arch-base-latest-3004-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3004-0-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3004-0-py3: {extends: '.test_instance'}
+default-almalinux-8-3004-0-py3: {extends: '.test_instance'}
+default-rockylinux-8-3004-0-py3: {extends: '.test_instance'}
+# default-debian-11-3003-3-py3: {extends: '.test_instance'}
+default-debian-10-3003-3-py3: {extends: '.test_instance'}
+# default-debian-9-3003-3-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3003-3-py3: {extends: '.test_instance'}
+default-ubuntu-1804-3003-3-py3: {extends: '.test_instance'}
+# default-centos-stream8-3003-3-py3: {extends: '.test_instance_failure_permitted'}
+# default-centos-8-3003-3-py3: {extends: '.test_instance'}
+default-centos-7-3003-3-py3: {extends: '.test_instance'}
+default-fedora-34-3003-3-py3: {extends: '.test_instance'}
+default-fedora-33-3003-3-py3: {extends: '.test_instance'}
+default-opensuse-leap-153-3003-3-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3003-3-py3: {extends: '.test_instance'}
+default-opensuse-tmbl-latest-3003-3-py3: {extends: '.test_instance_failure_permitted'}
+# default-amazonlinux-2-3003-3-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3003-3-py3: {extends: '.test_instance'}
+default-oraclelinux-7-3003-3-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3003-3-py3: {extends: '.test_instance'}
+default-gentoo-stage3-latest-3003-3-py3: {extends: '.test_instance'}
+default-gentoo-stage3-systemd-3003-3-py3: {extends: '.test_instance'}
+# default-almalinux-8-3003-3-py3: {extends: '.test_instance'}
+# default-debian-11-3002-7-py3: {extends: '.test_instance'}
+# default-debian-10-3002-7-py3: {extends: '.test_instance'}
+default-debian-9-3002-7-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3002-7-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3002-7-py3: {extends: '.test_instance'}
+# default-centos-8-3002-7-py3: {extends: '.test_instance'}
+# default-centos-7-3002-7-py3: {extends: '.test_instance'}
+# default-fedora-34-3002-7-py3: {extends: '.test_instance'}
+# default-fedora-33-3002-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3002-7-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3002-7-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3002-7-py3: {extends: '.test_instance_failure_permitted'}
+# default-amazonlinux-2-3002-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3002-7-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3002-7-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3002-7-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3002-7-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3002-7-py3: {extends: '.test_instance'}
+# default-debian-10-3001-8-py3: {extends: '.test_instance'}
+# default-debian-9-3001-8-py3: {extends: '.test_instance'}
+# default-ubuntu-2004-3001-8-py3: {extends: '.test_instance'}
+# default-ubuntu-1804-3001-8-py3: {extends: '.test_instance'}
+# default-centos-8-3001-8-py3: {extends: '.test_instance'}
+# default-centos-7-3001-8-py3: {extends: '.test_instance'}
+# default-fedora-34-3001-8-py3: {extends: '.test_instance'}
+# default-fedora-33-3001-8-py3: {extends: '.test_instance'}
+# default-opensuse-leap-153-3001-8-py3: {extends: '.test_instance'}
+# default-opensuse-leap-152-3001-8-py3: {extends: '.test_instance'}
+# default-opensuse-tmbl-latest-3001-8-py3: {extends: '.test_instance_failure_permitted'}
+# default-amazonlinux-2-3001-8-py3: {extends: '.test_instance'}
+# default-oraclelinux-8-3001-8-py3: {extends: '.test_instance'}
+# default-oraclelinux-7-3001-8-py3: {extends: '.test_instance'}
+# default-arch-base-latest-3001-8-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-latest-3001-8-py3: {extends: '.test_instance'}
+# default-gentoo-stage3-systemd-3001-8-py3: {extends: '.test_instance'}

 ###############################################################################
 # `release` stage: `semantic-release`
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -3,18 +3,6 @@
 ---
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
-ci:
-  autofix_commit_msg: |
-    ci(pre-commit.ci): apply auto fixes from pre-commit.com hooks
-
-    For more information, see https://pre-commit.ci
-  autofix_prs: true
-  autoupdate_branch: ''
-  autoupdate_commit_msg: |
-    ci(pre-commit.ci): perform `pre-commit` autoupdate
-  autoupdate_schedule: quarterly
-  skip: []
-  submodules: false
 default_stages: [commit]
 repos:
  - repo: https://github.com/dafyddj/commitlint-pre-commit-hook
@ -30,7 +18,7 @@ repos:
        additional_dependencies: ['@commitlint/config-conventional@8.3.4']
        always_run: true
  - repo: https://github.com/rubocop-hq/rubocop
-    rev: v1.30.1
+    rev: v1.9.1
    hooks:
      - id: rubocop
        name: Check Ruby files with rubocop
@ -38,14 +26,14 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/shellcheck-py/shellcheck-py
-    rev: v0.8.0.4
+    rev: v0.7.1.1
    hooks:
      - id: shellcheck
        name: Check shell scripts with shellcheck
        files: ^.*\.(sh|bash|ksh)$
        types: []
  - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.23.0
    hooks:
      - id: yamllint
        name: Check YAML syntax with yamllint
@ -53,7 +41,7 @@ repos:
        always_run: true
        pass_filenames: false
  - repo: https://github.com/warpnet/salt-lint
-    rev: v0.8.0
+    rev: v0.3.0
    hooks:
      - id: salt-lint
        name: Check Salt files using salt-lint
--- a/.rubocop.yml
+++ b/.rubocop.yml
@ -16,8 +16,4 @@ Security/YAMLLoad:
  Exclude:
    - test/integration/**/_mapdata.rb

-# General settings across all cops in this formula
-AllCops:
-  NewCops: enable
-
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
--- a/.travis.yml
+++ b/.travis.yml
@ -86,10 +86,10 @@ jobs:
    # - env: INSTANCE=default-debian-11-tiamat-py3
    # - env: INSTANCE=default-debian-10-tiamat-py3
    # - env: INSTANCE=default-debian-9-tiamat-py3
-    # - env: INSTANCE=default-ubuntu-2204-tiamat-py3
    # - env: INSTANCE=default-ubuntu-2004-tiamat-py3
    # - env: INSTANCE=default-ubuntu-1804-tiamat-py3
    # - env: INSTANCE=default-centos-stream8-tiamat-py3
+    # - env: INSTANCE=default-centos-8-tiamat-py3
    # - env: INSTANCE=default-centos-7-tiamat-py3
    # - env: INSTANCE=default-amazonlinux-2-tiamat-py3
    # - env: INSTANCE=default-oraclelinux-8-tiamat-py3
@ -99,14 +99,15 @@ jobs:
    # - env: INSTANCE=default-debian-11-master-py3
    # - env: INSTANCE=default-debian-10-master-py3
    # - env: INSTANCE=default-debian-9-master-py3
-    # - env: INSTANCE=default-ubuntu-2204-master-py3
    # - env: INSTANCE=default-ubuntu-2004-master-py3
    # - env: INSTANCE=default-ubuntu-1804-master-py3
    # - env: INSTANCE=default-centos-stream8-master-py3
+    # - env: INSTANCE=default-centos-8-master-py3
    # - env: INSTANCE=default-centos-7-master-py3
-    # - env: INSTANCE=default-fedora-36-master-py3
-    # - env: INSTANCE=default-fedora-35-master-py3
+    # - env: INSTANCE=default-fedora-34-master-py3
+    # - env: INSTANCE=default-fedora-33-master-py3
    # - env: INSTANCE=default-opensuse-leap-153-master-py3
+    # - env: INSTANCE=default-opensuse-leap-152-master-py3
    # - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
    # - env: INSTANCE=default-amazonlinux-2-master-py3
    # - env: INSTANCE=default-oraclelinux-8-master-py3
@ -116,36 +117,82 @@ jobs:
    # - env: INSTANCE=default-gentoo-stage3-systemd-master-py3
    # - env: INSTANCE=default-almalinux-8-master-py3
    # - env: INSTANCE=default-rockylinux-8-master-py3
-    - env: INSTANCE=default-debian-11-3004-1-py3
-    # - env: INSTANCE=default-debian-10-3004-1-py3
-    # - env: INSTANCE=default-debian-9-3004-1-py3
-    - env: INSTANCE=default-ubuntu-2204-3004-1-py3
-    - env: INSTANCE=default-ubuntu-2004-3004-1-py3
-    # - env: INSTANCE=default-ubuntu-1804-3004-1-py3
-    - env: INSTANCE=default-centos-stream8-3004-1-py3
-    # - env: INSTANCE=default-centos-7-3004-1-py3
-    - env: INSTANCE=default-fedora-36-3004-1-py3
-    - env: INSTANCE=default-fedora-35-3004-1-py3
-    - env: INSTANCE=default-amazonlinux-2-3004-1-py3
-    - env: INSTANCE=default-oraclelinux-8-3004-1-py3
-    # - env: INSTANCE=default-oraclelinux-7-3004-1-py3
-    - env: INSTANCE=default-arch-base-latest-3004-1-py3
-    - env: INSTANCE=default-gentoo-stage3-latest-3004-1-py3
-    - env: INSTANCE=default-gentoo-stage3-systemd-3004-1-py3
-    - env: INSTANCE=default-almalinux-8-3004-1-py3
-    - env: INSTANCE=default-rockylinux-8-3004-1-py3
-    - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
-    - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
-    - env: INSTANCE=default-debian-10-3003-4-py3
-    - env: INSTANCE=default-debian-9-3003-4-py3
-    # - env: INSTANCE=default-ubuntu-2004-3003-4-py3
-    - env: INSTANCE=default-ubuntu-1804-3003-4-py3
-    # - env: INSTANCE=default-centos-stream8-3003-4-py3
-    - env: INSTANCE=default-centos-7-3003-4-py3
-    # - env: INSTANCE=default-amazonlinux-2-3003-4-py3
-    # - env: INSTANCE=default-oraclelinux-8-3003-4-py3
-    - env: INSTANCE=default-oraclelinux-7-3003-4-py3
-    # - env: INSTANCE=default-almalinux-8-3003-4-py3
+    - env: INSTANCE=default-debian-11-3004-0-py3
+    # - env: INSTANCE=default-debian-10-3004-0-py3
+    # - env: INSTANCE=default-debian-9-3004-0-py3
+    - env: INSTANCE=default-ubuntu-2004-3004-0-py3
+    # - env: INSTANCE=default-ubuntu-1804-3004-0-py3
+    - env: INSTANCE=default-centos-stream8-3004-0-py3
+    - env: INSTANCE=default-centos-8-3004-0-py3
+    # - env: INSTANCE=default-centos-7-3004-0-py3
+    # - env: INSTANCE=default-fedora-34-3004-0-py3
+    # - env: INSTANCE=default-fedora-33-3004-0-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3004-0-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3004-0-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3004-0-py3
+    - env: INSTANCE=default-amazonlinux-2-3004-0-py3
+    - env: INSTANCE=default-oraclelinux-8-3004-0-py3
+    # - env: INSTANCE=default-oraclelinux-7-3004-0-py3
+    - env: INSTANCE=default-arch-base-latest-3004-0-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3004-0-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3004-0-py3
+    - env: INSTANCE=default-almalinux-8-3004-0-py3
+    - env: INSTANCE=default-rockylinux-8-3004-0-py3
+    # - env: INSTANCE=default-debian-11-3003-3-py3
+    - env: INSTANCE=default-debian-10-3003-3-py3
+    # - env: INSTANCE=default-debian-9-3003-3-py3
+    # - env: INSTANCE=default-ubuntu-2004-3003-3-py3
+    - env: INSTANCE=default-ubuntu-1804-3003-3-py3
+    # - env: INSTANCE=default-centos-stream8-3003-3-py3
+    # - env: INSTANCE=default-centos-8-3003-3-py3
+    - env: INSTANCE=default-centos-7-3003-3-py3
+    - env: INSTANCE=default-fedora-34-3003-3-py3
+    - env: INSTANCE=default-fedora-33-3003-3-py3
+    - env: INSTANCE=default-opensuse-leap-153-3003-3-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3003-3-py3
+    - env: INSTANCE=default-opensuse-tmbl-latest-3003-3-py3
+    # - env: INSTANCE=default-amazonlinux-2-3003-3-py3
+    # - env: INSTANCE=default-oraclelinux-8-3003-3-py3
+    - env: INSTANCE=default-oraclelinux-7-3003-3-py3
+    # - env: INSTANCE=default-arch-base-latest-3003-3-py3
+    - env: INSTANCE=default-gentoo-stage3-latest-3003-3-py3
+    - env: INSTANCE=default-gentoo-stage3-systemd-3003-3-py3
+    # - env: INSTANCE=default-almalinux-8-3003-3-py3
+    # - env: INSTANCE=default-debian-11-3002-7-py3
+    # - env: INSTANCE=default-debian-10-3002-7-py3
+    - env: INSTANCE=default-debian-9-3002-7-py3
+    # - env: INSTANCE=default-ubuntu-2004-3002-7-py3
+    # - env: INSTANCE=default-ubuntu-1804-3002-7-py3
+    # - env: INSTANCE=default-centos-8-3002-7-py3
+    # - env: INSTANCE=default-centos-7-3002-7-py3
+    # - env: INSTANCE=default-fedora-34-3002-7-py3
+    # - env: INSTANCE=default-fedora-33-3002-7-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3002-7-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3002-7-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3002-7-py3
+    # - env: INSTANCE=default-amazonlinux-2-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-8-3002-7-py3
+    # - env: INSTANCE=default-oraclelinux-7-3002-7-py3
+    # - env: INSTANCE=default-arch-base-latest-3002-7-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3002-7-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3002-7-py3
+    # - env: INSTANCE=default-debian-10-3001-8-py3
+    # - env: INSTANCE=default-debian-9-3001-8-py3
+    # - env: INSTANCE=default-ubuntu-2004-3001-8-py3
+    # - env: INSTANCE=default-ubuntu-1804-3001-8-py3
+    # - env: INSTANCE=default-centos-8-3001-8-py3
+    # - env: INSTANCE=default-centos-7-3001-8-py3
+    # - env: INSTANCE=default-fedora-34-3001-8-py3
+    # - env: INSTANCE=default-fedora-33-3001-8-py3
+    # - env: INSTANCE=default-opensuse-leap-153-3001-8-py3
+    # - env: INSTANCE=default-opensuse-leap-152-3001-8-py3
+    # - env: INSTANCE=default-opensuse-tmbl-latest-3001-8-py3
+    # - env: INSTANCE=default-amazonlinux-2-3001-8-py3
+    # - env: INSTANCE=default-oraclelinux-8-3001-8-py3
+    # - env: INSTANCE=default-oraclelinux-7-3001-8-py3
+    # - env: INSTANCE=default-arch-base-latest-3001-8-py3
+    # - env: INSTANCE=default-gentoo-stage3-latest-3001-8-py3
+    # - env: INSTANCE=default-gentoo-stage3-systemd-3001-8-py3

    ## Define the release stage that runs `semantic-release`
    - stage: 'release'
--- a/AUTHORS.md
+++ b/AUTHORS.md
@ -4,25 +4,24 @@ This list is sorted by the number of commits per contributor in _descending_ ord

 Avatar|Contributor|Contributions
 :-:|---|:-:
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|299
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|102
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|245
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|101
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|71
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|54
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|43
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|23
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|40
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|22
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|22
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|21
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7139195?v=4' width='36' height='36' alt='@xenophonf'>|[@xenophonf](https://github.com/xenophonf)|18
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7460036?v=4' width='36' height='36' alt='@andrew-vant'>|[@andrew-vant](https://github.com/andrew-vant)|13
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|13
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>|[@dafyddj](https://github.com/dafyddj)|12
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|12
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1013915?v=4' width='36' height='36' alt='@rhertzog'>|[@rhertzog](https://github.com/rhertzog)|12
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@wwentland'>|[@wwentland](https://github.com/wwentland)|8
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>|[@babilen](https://github.com/babilen)|8
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/306240?v=4' width='36' height='36' alt='@UtahDave'>|[@UtahDave](https://github.com/UtahDave)|8
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3059577?v=4' width='36' height='36' alt='@colin-stubbs'>|[@colin-stubbs](https://github.com/colin-stubbs)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/287147?v=4' width='36' height='36' alt='@techhat'>|[@techhat](https://github.com/techhat)|7
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3045456?v=4' width='36' height='36' alt='@bradthurber'>|[@bradthurber](https://github.com/bradthurber)|6
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>|[@pprkut](https://github.com/pprkut)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7406466?v=4' width='36' height='36' alt='@fizmat'>|[@fizmat](https://github.com/fizmat)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/507599?v=4' width='36' height='36' alt='@thatch45'>|[@thatch45](https://github.com/thatch45)|6
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7060082?v=4' width='36' height='36' alt='@msciciel'>|[@msciciel](https://github.com/msciciel)|6
@ -31,16 +30,16 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/478653?v=4' width='36' height='36' alt='@mrichar1'>|[@mrichar1](https://github.com/mrichar1)|5
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6215293?v=4' width='36' height='36' alt='@0xf10e'>|[@0xf10e](https://github.com/0xf10e)|5
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|4
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>|[@pprkut](https://github.com/pprkut)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/41886?v=4' width='36' height='36' alt='@jbouse'>|[@jbouse](https://github.com/jbouse)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/48949?v=4' width='36' height='36' alt='@tampakrap'>|[@tampakrap](https://github.com/tampakrap)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/31497?v=4' width='36' height='36' alt='@MSeven'>|[@MSeven](https://github.com/MSeven)|4
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/652532?v=4' width='36' height='36' alt='@jcftang'>|[@jcftang](https://github.com/jcftang)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/830800?v=4' width='36' height='36' alt='@johtso'>|[@johtso](https://github.com/johtso)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/90042?v=4' width='36' height='36' alt='@kev009'>|[@kev009](https://github.com/kev009)|3
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/299386?v=4' width='36' height='36' alt='@excavador'>|[@excavador](https://github.com/excavador)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>|[@vquiering](https://github.com/vquiering)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>|[@ze42](https://github.com/ze42)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2377054?v=4' width='36' height='36' alt='@smlloyd'>|[@smlloyd](https://github.com/smlloyd)|3
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|3
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3280630?v=4' width='36' height='36' alt='@cackovic'>|[@cackovic](https://github.com/cackovic)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/499018?v=4' width='36' height='36' alt='@AntoineCezar'>|[@AntoineCezar](https://github.com/AntoineCezar)|2
@ -61,14 +60,15 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3762852?v=4' width='36' height='36' alt='@tobias-m'>|[@tobias-m](https://github.com/tobias-m)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>|[@ek9](https://github.com/ek9)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13768037?v=4' width='36' height='36' alt='@hkbakke'>|[@hkbakke](https://github.com/hkbakke)|2
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/398720?v=4' width='36' height='36' alt='@tiger-seo'>|[@tiger-seo](https://github.com/tiger-seo)|2
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>|[@ze42](https://github.com/ze42)|2
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5922290?v=4' width='36' height='36' alt='@major0'>|[@major0](https://github.com/major0)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2061751?v=4' width='36' height='36' alt='@matthew-parlette'>|[@matthew-parlette](https://github.com/matthew-parlette)|2
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/8395913?v=4' width='36' height='36' alt='@aanriot'>|[@aanriot](https://github.com/aanriot)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/9849167?v=4' width='36' height='36' alt='@alejdg'>|[@alejdg](https://github.com/alejdg)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3441274?v=4' width='36' height='36' alt='@ernstae'>|[@ernstae](https://github.com/ernstae)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurzenika'>|[@arthurzenika](https://github.com/arthurzenika)|1
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>|[@arthurlogilab](https://github.com/arthurlogilab)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3058109?v=4' width='36' height='36' alt='@kakwa'>|[@kakwa](https://github.com/kakwa)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1136182?v=4' width='36' height='36' alt='@dth202'>|[@dth202](https://github.com/dth202)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1233212?v=4' width='36' height='36' alt='@baby-gnu'>|[@baby-gnu](https://github.com/baby-gnu)|1
@ -76,7 +76,6 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2487617?v=4' width='36' height='36' alt='@mecavity'>|[@mecavity](https://github.com/mecavity)|1
-<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10227523?v=4' width='36' height='36' alt='@llua'>|[@llua](https://github.com/llua)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/30061305?v=4' width='36' height='36' alt='@felix-russell'>|[@felix-russell](https://github.com/felix-russell)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/12703819?v=4' width='36' height='36' alt='@Furlot'>|[@Furlot](https://github.com/Furlot)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2692848?v=4' width='36' height='36' alt='@iondulgheru'>|[@iondulgheru](https://github.com/iondulgheru)|1
@ -110,8 +109,9 @@ Avatar|Contributor|Contributions
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/94636?v=4' width='36' height='36' alt='@jpic'>|[@jpic](https://github.com/jpic)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/6826176?v=4' width='36' height='36' alt='@kabakaev'>|[@kabakaev](https://github.com/kabakaev)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1610361?v=4' width='36' height='36' alt='@mechleg'>|[@mechleg](https://github.com/mechleg)|1
+<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>|[@sticky-note](https://github.com/sticky-note)|1
 <img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/542613?v=4' width='36' height='36' alt='@bersace'>|[@bersace](https://github.com/bersace)|1

 ---

-Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-08-26.
+Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2021-12-19.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,123 +1,5 @@
 # Changelog

-# [1.12.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.11.0...v1.12.0) (2022-08-26)
-
-
-### Continuous Integration
-
-* update `pre-commit` configuration inc. for pre-commit.ci [skip ci] ([c8f9dd4](https://github.com/saltstack-formulas/salt-formula/commit/c8f9dd44e610b250dc85a1e1f9c5475866902b5c))
-
-
-### Features
-
-* **freebsd:** update package names for Python 3.9 ([2881fdd](https://github.com/saltstack-formulas/salt-formula/commit/2881fdd81136b1d57ae493dcb58b2b79947f6d0a))
-
-# [1.11.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.3...v1.11.0) (2022-05-17)
-
-
-### Bug Fixes
-
-* **minion:** replace literals with `rootuser` & `rootgroup` from map ([b2316ed](https://github.com/saltstack-formulas/salt-formula/commit/b2316ed17b7c60e5a4ee394f18fcad70572dc53d))
-
-
-### Code Refactoring
-
-* **minion:** use `pkg.installed` state for macOS ([3eff2d2](https://github.com/saltstack-formulas/salt-formula/commit/3eff2d2acf43eb87015007fdfc5dd92bb8edaaf7))
-
-
-### Continuous Integration
-
-* **macos:** enable testing using GitHub Actions ([8ab60b9](https://github.com/saltstack-formulas/salt-formula/commit/8ab60b9689158035a4d60a165729135b086e499d))
-* **vagrant:** use `linked_clone` at all times (inc. CI) [skip ci] ([18a6230](https://github.com/saltstack-formulas/salt-formula/commit/18a62308564faefa53cfc2b535a7fb9763c0c130))
-
-
-### Features
-
-* **macos:** use `saltstack` as package to install ([c05fddf](https://github.com/saltstack-formulas/salt-formula/commit/c05fddf139e2a7ba9032ed1d1710929b9679b59c))
-
-
-### Tests
-
-* **macos:** add `map.jinja` verification files ([c1c635f](https://github.com/saltstack-formulas/salt-formula/commit/c1c635fda48384c13284fbb424c88a1bfd3f0486))
-* **macos:** update for this platform ([dc9cff9](https://github.com/saltstack-formulas/salt-formula/commit/dc9cff99c5bcc487a68f488bbe419758ac72987c))
-* **system.rb:** add support for `mac_os_x` [skip ci] ([e8a1237](https://github.com/saltstack-formulas/salt-formula/commit/e8a12376324a1ae6a62485da6b84ccb3df8ac484))
-
-## [1.10.3](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.2...v1.10.3) (2022-04-13)
-
-
-### Bug Fixes
-
-* **pkgrepo:** pkgrepo use cmd.shell ([0e4b3bd](https://github.com/saltstack-formulas/salt-formula/commit/0e4b3bdf945d89cc8a4cc614fbe2073426363dff))
-
-
-### Continuous Integration
-
-* **kitchen.windows:** fix version number for Salt installation [skip ci] ([37dd068](https://github.com/saltstack-formulas/salt-formula/commit/37dd068d199b4ee049c31807ecf34dfadec0179b))
-
-
-### Tests
-
-* **_mapdata:** add verification file for `fedora-36` [skip ci] ([c20deb9](https://github.com/saltstack-formulas/salt-formula/commit/c20deb92d48e26a83732eefa196f2f08d6548bff))
-
-## [1.10.2](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.1...v1.10.2) (2022-04-03)
-
-
-### Bug Fixes
-
-* **gentoo:** use `retry_options` to avoid spurious service failures ([d00c069](https://github.com/saltstack-formulas/salt-formula/commit/d00c069e25463e6e675b0cea9f625a6e78985744))
-
-
-### Continuous Integration
-
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([92a82a9](https://github.com/saltstack-formulas/salt-formula/commit/92a82a98c72e5297caf08e1e135b72d09c2e4149))
-* update linters to latest versions [skip ci] ([47efbc0](https://github.com/saltstack-formulas/salt-formula/commit/47efbc04920a3f20ef9a69350b1ee46bbee11b37))
-
-
-### Tests
-
-* **_mapdata:** add/update verification files for Fedora & Gentoo ([e9cb3d2](https://github.com/saltstack-formulas/salt-formula/commit/e9cb3d27284d81115bac16c3af225c4b25eebaf9))
-* **system:** add `build_platform_codename` [skip ci] ([6b5598a](https://github.com/saltstack-formulas/salt-formula/commit/6b5598a8d8d91ccc367283f80d5c736c7eb0168c))
-
-## [1.10.1](https://github.com/saltstack-formulas/salt-formula/compare/v1.10.0...v1.10.1) (2022-02-03)
-
-
-### Bug Fixes
-
-* **minion:** respect `minion_remove_config: true` ([02c31df](https://github.com/saltstack-formulas/salt-formula/commit/02c31df0c5cca2863a46fd3c517a6610bb331548)), closes [#527](https://github.com/saltstack-formulas/salt-formula/issues/527)
-
-
-### Continuous Integration
-
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] ([46fc639](https://github.com/saltstack-formulas/salt-formula/commit/46fc639d46bedfe0489ed66719534384fcc84757))
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] ([d95dac2](https://github.com/saltstack-formulas/salt-formula/commit/d95dac24aadd343bf92a976a59e0a72be6ade2d8))
-* **windows:** update Salt version installed to `3004-3` [skip ci] ([fdccb9b](https://github.com/saltstack-formulas/salt-formula/commit/fdccb9b6125acbc90d1a596553eced7525af4a47))
-* **windows:** use Salt version `3004` [skip ci] ([a1e9823](https://github.com/saltstack-formulas/salt-formula/commit/a1e9823b42205f1442d3bea2037936b64760a8b6))
-
-
-### Tests
-
-* update for new pre-salted images [skip ci] ([8015fe0](https://github.com/saltstack-formulas/salt-formula/commit/8015fe0c9252d80c8c63aa08a1a0152e0eba279b))
-
-# [1.10.0](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.10...v1.10.0) (2021-12-27)
-
-
-### Bug Fixes
-
-* **log_fmt_console:** double option in config ([b705e44](https://github.com/saltstack-formulas/salt-formula/commit/b705e44378dc8905e4394362c55cd757afb88be7))
-* **minion:** fix windows path construction ([c9c6e12](https://github.com/saltstack-formulas/salt-formula/commit/c9c6e1222396ef3105c19bb7d4e9e8f1670fd700))
-
-
-### Continuous Integration
-
-* **proxy:** replace deprecated Windows `2016` with `2022` [skip ci] ([21b8d36](https://github.com/saltstack-formulas/salt-formula/commit/21b8d3626e4f356b43cac8098f5f9be334840818))
-* **proxy+windows:** fix setting up WinRM [skip ci] ([39cbc1b](https://github.com/saltstack-formulas/salt-formula/commit/39cbc1b91bfe5c46664ca2a74233b62f99ac3850))
-* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] ([1654e67](https://github.com/saltstack-formulas/salt-formula/commit/1654e6746b4e0c18d2a88fa2afe678f6f5bb5238))
-
-
-### Features
-
-* **minion:** ensure correct permissions for salt-cloud generated files ([dfa7f7d](https://github.com/saltstack-formulas/salt-formula/commit/dfa7f7d1d8fd02c928a71415b49c408446e09423))
-
 ## [1.9.10](https://github.com/saltstack-formulas/salt-formula/compare/v1.9.9...v1.9.10) (2021-12-19)


--- a/2
+++ b/2
@ -1,7 +1,7 @@
 name: salt
 os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Oracle, Amazon, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, FreeBSD, OpenBSD, Windows
 os_family: Debian, Redhat, Suse, Arch, Gentoo, FreeBSD, Windows
-version: 1.12.0
+version: 1.9.10
 release: 1
 minimum_version: 2015.8
 summary: Formula for install Saltstack
--- a/4
+++ b/4
@ -1,6 +1,6 @@
 # frozen_string_literal: true

-source ENV.fetch('PROXY_RUBYGEMSORG', 'https://rubygems.org')
+source 'https://rubygems.org'

 # Install the `inspec` gem using `git` because versions after `4.22.22`
 # suppress diff output; this version fixes this for our uses.
@ -16,7 +16,7 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
 # rubocop:enable Layout/LineLength

 gem 'kitchen-inspec', '>= 2.5.0'
-gem 'kitchen-salt', '>= 0.7.2'
+gem 'kitchen-salt', '>= 0.6.3'

 group :vagrant do
  gem 'kitchen-vagrant'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -1,20 +1,19 @@
 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
-  revision: aaef842906a5666f0fc0b4f186b4dd3498f5b28c
+  revision: b486a1e6b6593effd97dffbde58f0a56946cf0e1
  branch: ssf
  specs:
-    inspec (5.18.15)
+    inspec (4.52.6)
      cookstyle
      faraday_middleware (>= 0.12.2, < 1.1)
-      inspec-core (= 5.18.15)
+      inspec-core (= 4.52.6)
      mongo (= 2.13.2)
-      progress_bar (~> 1.3.3)
      rake
-      train (~> 3.10)
+      train (~> 3.0)
      train-aws (~> 0.2)
      train-habitat (~> 0.1)
      train-winrm (~> 0.2)
-    inspec-core (5.18.15)
+    inspec-core (4.52.6)
      addressable (~> 2.4)
      chef-telemetry (~> 1.0, >= 1.0.8)
      faraday (>= 0.9.0, < 1.5)
@ -27,55 +26,56 @@ GIT
      parallel (~> 1.9)
      parslet (>= 1.5, < 2.0)
      pry (~> 0.13)
-      rspec (>= 3.9, <= 3.11)
+      rspec (>= 3.9, < 3.11)
      rspec-its (~> 1.2)
      rubyzip (>= 1.2.2, < 3.0)
      semverse (~> 3.0)
      sslshake (~> 1.2)
      thor (>= 0.20, < 2.0)
      tomlrb (>= 1.2, < 2.1)
-      train-core (~> 3.10)
+      train-core (~> 3.0)
      tty-prompt (~> 0.17)
      tty-table (~> 0.10)

 GIT
  remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
-  revision: 9a09bc1e571e25f3ccabf4725ca2048d970fff82
+  revision: 428c89fc250b3790abad5ecb0afe0c3d4956084c
  branch: ssf
  specs:
-    kitchen-docker (2.12.0)
+    kitchen-docker (2.11.0)
      test-kitchen (>= 1.0.0)

 GEM
  remote: https://rubygems.org/
  specs:
-    activesupport (7.0.3.1)
+    activesupport (6.1.4.1)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
      minitest (>= 5.1)
      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
    addressable (2.8.0)
      public_suffix (>= 2.0.2, < 5.0)
    ast (2.4.2)
    aws-eventstream (1.2.0)
-    aws-partitions (1.607.0)
-    aws-sdk-alexaforbusiness (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-partitions (1.541.0)
+    aws-sdk-alexaforbusiness (1.53.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-amplify (1.32.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigateway (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-apigateway (1.71.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-apigatewayv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-apigatewayv2 (1.39.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-applicationautoscaling (1.51.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-athena (1.55.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-athena (1.44.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-autoscaling (1.63.0)
      aws-sdk-core (~> 3, >= 3.112.0)
@ -83,41 +83,41 @@ GEM
    aws-sdk-batch (1.47.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-budgets (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-budgets (1.44.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudformation (1.70.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudformation (1.63.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudfront (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudfront (1.60.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsm (1.39.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudhsm (1.36.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudhsmv2 (1.42.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudhsmv2 (1.39.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudtrail (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudtrail (1.42.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatch (1.59.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cloudwatchevents (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatchlogs (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatchlogs (1.49.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codecommit (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codecommit (1.48.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codedeploy (1.49.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codedeploy (1.46.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-codepipeline (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-codepipeline (1.50.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-cognitoidentity (1.31.0)
      aws-sdk-core (~> 3, >= 3.112.0)
@ -125,55 +125,55 @@ GEM
    aws-sdk-cognitoidentityprovider (1.53.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-configservice (1.79.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-configservice (1.70.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.2)
+    aws-sdk-core (3.124.0)
      aws-eventstream (~> 1, >= 1.0.2)
      aws-partitions (~> 1, >= 1.525.0)
      aws-sigv4 (~> 1.1)
-      jmespath (~> 1, >= 1.6.1)
-    aws-sdk-costandusagereportservice (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+      jmespath (~> 1.0)
+    aws-sdk-costandusagereportservice (1.37.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-databasemigrationservice (1.53.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-dynamodb (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-dynamodb (1.69.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ec2 (1.322.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ec2 (1.287.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecr (1.56.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecr (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecrpublic (1.12.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecrpublic (1.9.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ecs (1.100.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ecs (1.92.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-efs (1.54.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-efs (1.49.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-eks (1.69.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticache (1.67.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticbeanstalk (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticbeanstalk (1.48.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancing (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancing (1.37.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticloadbalancingv2 (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticloadbalancingv2 (1.74.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-elasticsearchservice (1.65.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticsearchservice (1.60.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-emr (1.53.0)
      aws-sdk-core (~> 3, >= 3.121.2)
@ -181,38 +181,38 @@ GEM
    aws-sdk-eventbridge (1.24.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-firehose (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-firehose (1.45.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-glue (1.88.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-guardduty (1.58.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-guardduty (1.51.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-iam (1.64.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kafka (1.50.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kafka (1.45.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kinesis (1.41.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kinesis (1.38.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.52.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-lambda (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-lambda (1.76.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-mq (1.40.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-networkfirewall (1.17.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-networkfirewall (1.12.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-networkmanager (1.24.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-networkmanager (1.19.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-organizations (1.59.0)
      aws-sdk-core (~> 3, >= 3.112.0)
@ -220,23 +220,23 @@ GEM
    aws-sdk-ram (1.26.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-rds (1.133.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-redshift (1.84.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-redshift (1.74.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.63.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53 (1.59.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53domains (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53domains (1.37.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-route53resolver (1.37.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53resolver (1.34.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.109.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.4)
    aws-sdk-s3control (1.43.0)
@ -245,8 +245,8 @@ GEM
    aws-sdk-secretsmanager (1.46.0)
      aws-sdk-core (~> 3, >= 3.112.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-securityhub (1.67.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-securityhub (1.57.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-servicecatalog (1.60.0)
      aws-sdk-core (~> 3, >= 3.112.0)
@ -254,8 +254,8 @@ GEM
    aws-sdk-ses (1.41.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-shield (1.48.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-shield (1.45.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-signer (1.32.0)
      aws-sdk-core (~> 3, >= 3.120.0)
@ -263,17 +263,17 @@ GEM
    aws-sdk-simpledb (1.29.0)
      aws-sdk-core (~> 3, >= 3.120.0)
      aws-sigv2 (~> 1.0)
-    aws-sdk-sms (1.40.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sms (1.36.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sns (1.49.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-sqs (1.51.1)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sqs (1.48.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.137.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ssm (1.126.0)
+      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sdk-states (1.39.0)
      aws-sdk-core (~> 3, >= 3.112.0)
@ -288,7 +288,7 @@ GEM
      aws-sdk-core (~> 3, >= 3.122.0)
      aws-sigv4 (~> 1.1)
    aws-sigv2 (1.1.0)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.4.0)
      aws-eventstream (~> 1, >= 1.0.2)
    azure_graph_rbac (0.17.2)
      ms_rest_azure (~> 0.12.0)
@ -301,11 +301,11 @@ GEM
    azure_mgmt_storage (0.23.0)
      ms_rest_azure (~> 0.12.0)
    bcrypt_pbkdf (1.1.0)
-    bson (4.15.0)
+    bson (4.12.1)
    builder (3.2.4)
-    chef-config (17.10.0)
+    chef-config (17.8.25)
      addressable
-      chef-utils (= 17.10.0)
+      chef-utils (= 17.8.25)
      fuzzyurl
      mixlib-config (>= 2.2.12, < 4.0)
      mixlib-shellout (>= 2.0, < 4.0)
@ -313,22 +313,22 @@ GEM
    chef-telemetry (1.1.1)
      chef-config
      concurrent-ruby (~> 1.0)
-    chef-utils (17.10.0)
+    chef-utils (17.8.25)
      concurrent-ruby
    coderay (1.1.3)
-    concurrent-ruby (1.1.10)
-    cookstyle (7.32.1)
-      rubocop (= 1.25.1)
+    concurrent-ruby (1.1.9)
+    cookstyle (7.25.10)
+      rubocop (= 1.23.0)
    declarative (0.0.20)
-    diff-lcs (1.5.0)
+    diff-lcs (1.4.4)
    docker-api (2.2.0)
      excon (>= 0.47.0)
      multi_json
    domain_name (0.5.20190701)
      unf (>= 0.0.5, < 1.0.0)
-    ed25519 (1.3.0)
+    ed25519 (1.2.4)
    erubi (1.10.0)
-    excon (0.92.3)
+    excon (0.89.0)
    faraday (1.4.3)
      faraday-em_http (~> 1.0)
      faraday-em_synchrony (~> 1.0)
@ -347,7 +347,7 @@ GEM
    faraday-net_http_persistent (1.2.0)
    faraday_middleware (1.0.0)
      faraday (~> 1.0)
-    ffi (1.15.5)
+    ffi (1.15.4)
    fuzzyurl (0.9.0)
    google-api-client (0.52.0)
      addressable (~> 2.5, >= 2.5.1)
@ -367,28 +367,26 @@ GEM
      signet (~> 0.14)
    gssapi (1.3.1)
      ffi (>= 1.0.1)
-    gyoku (1.4.0)
+    gyoku (1.3.1)
      builder (>= 2.1.2)
-      rexml (~> 3.0)
    hashie (4.1.0)
-    highline (2.0.3)
-    http-cookie (1.0.5)
+    http-cookie (1.0.4)
      domain_name (~> 0.5)
    httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.8.11)
      concurrent-ruby (~> 1.0)
    inifile (3.0.0)
-    jmespath (1.6.1)
-    json (2.6.2)
-    jwt (2.4.1)
-    kitchen-inspec (2.6.1)
+    jmespath (1.4.0)
+    json (2.6.1)
+    jwt (2.3.0)
+    kitchen-inspec (2.5.0)
      hashie (>= 3.4, <= 5.0)
-      inspec (>= 2.2.64, < 7.0)
+      inspec (>= 2.2.64, < 5.0)
      test-kitchen (>= 2.7, < 4)
-    kitchen-salt (0.7.2)
+    kitchen-salt (0.6.3)
      hashie (>= 3.5)
      test-kitchen (>= 1.4)
-    kitchen-vagrant (1.12.0)
+    kitchen-vagrant (1.11.0)
      test-kitchen (>= 1.4, < 4)
    license-acceptance (2.1.13)
      pastel (~> 0.7)
@ -396,21 +394,21 @@ GEM
      tty-box (~> 0.6)
      tty-prompt (~> 0.20)
    little-plugger (1.1.4)
-    logging (2.3.1)
+    logging (2.3.0)
      little-plugger (~> 1.1)
      multi_json (~> 1.14)
    memoist (0.16.2)
    method_source (1.0.0)
    mini_mime (1.1.2)
-    minitest (5.16.2)
-    mixlib-config (3.0.27)
+    minitest (5.14.4)
+    mixlib-config (3.0.9)
      tomlrb
-    mixlib-install (3.12.19)
+    mixlib-install (3.12.16)
      mixlib-shellout
      mixlib-versioning
      thor
    mixlib-log (3.0.9)
-    mixlib-shellout (3.2.7)
+    mixlib-shellout (3.2.5)
      chef-utils
    mixlib-versioning (1.2.12)
    mongo (2.13.2)
@ -425,72 +423,68 @@ GEM
      faraday-cookie_jar (~> 0.0.6)
      ms_rest (~> 0.7.6)
    multi_json (1.15.0)
-    multipart-post (2.2.3)
+    multipart-post (2.1.1)
    net-scp (3.0.0)
      net-ssh (>= 2.6.5, < 7.0.0)
    net-ssh (6.1.0)
    net-ssh-gateway (2.0.0)
      net-ssh (>= 4.0.0)
    nori (2.6.0)
-    options (2.3.2)
    os (1.1.4)
-    parallel (1.22.1)
-    parser (3.1.2.0)
+    parallel (1.21.0)
+    parser (3.0.3.2)
      ast (~> 2.4.1)
    parslet (1.8.2)
    pastel (0.8.0)
      tty-color (~> 0.5)
-    progress_bar (1.3.3)
-      highline (>= 1.6, < 3)
-      options (~> 2.3.0)
    pry (0.14.1)
      coderay (~> 1.1)
      method_source (~> 1.0)
-    public_suffix (4.0.7)
-    rainbow (3.1.1)
+    public_suffix (4.0.6)
+    rainbow (3.0.0)
    rake (13.0.6)
-    regexp_parser (2.5.0)
-    representable (3.2.0)
+    regexp_parser (2.2.0)
+    representable (3.1.1)
      declarative (< 0.1.0)
      trailblazer-option (>= 0.1.1, < 0.2.0)
      uber (< 0.2.0)
    retriable (3.1.2)
    rexml (3.2.5)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.10.0)
    rspec-its (1.3.0)
      rspec-core (>= 3.0.0)
      rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.10.2)
      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.25.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.0.0.0)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 1.8, < 3.0)
      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.12.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.19.1)
-      parser (>= 3.1.1.0)
+    rubocop-ast (1.15.0)
+      parser (>= 3.0.1.1)
    ruby-progressbar (1.11.0)
    ruby2_keywords (0.0.5)
    rubyntlm (0.6.3)
    rubyzip (2.3.2)
-    semverse (3.0.2)
-    signet (0.17.0)
+    semverse (3.0.0)
+    signet (0.16.0)
      addressable (~> 2.8)
-      faraday (>= 0.17.5, < 3.a)
+      faraday (>= 0.17.3, < 2.0)
      jwt (>= 1.5, < 3.0)
      multi_json (~> 1.10)
    sslshake (1.3.1)
@ -499,7 +493,7 @@ GEM
      unicode-display_width (>= 1.5, < 3.0)
      unicode_utils (~> 1.4)
    strings-ansi (0.2.0)
-    test-kitchen (3.3.1)
+    test-kitchen (3.2.2)
      bcrypt_pbkdf (~> 1.0)
      chef-utils (>= 16.4.35)
      ed25519 (~> 1.2)
@ -513,11 +507,11 @@ GEM
      winrm (~> 2.0)
      winrm-elevated (~> 1.0)
      winrm-fs (~> 1.1)
-    thor (1.2.1)
+    thor (1.1.0)
    timeliness (0.3.10)
    tomlrb (1.3.0)
    trailblazer-option (0.1.2)
-    train (3.10.1)
+    train (3.8.5)
      activesupport (>= 6.0.3.1)
      azure_graph_rbac (~> 0.16)
      azure_mgmt_key_vault (~> 0.17)
@ -528,7 +522,7 @@ GEM
      google-api-client (>= 0.23.9, <= 0.52.0)
      googleauth (>= 0.6.6, <= 0.14.0)
      inifile (~> 3.0)
-      train-core (= 3.10.1)
+      train-core (= 3.8.5)
      train-winrm (~> 0.2)
    train-aws (0.2.24)
      aws-sdk-alexaforbusiness (~> 1.0)
@ -606,7 +600,7 @@ GEM
      aws-sdk-synthetics (~> 1.19.0)
      aws-sdk-transfer (>= 1.26, < 1.35)
      aws-sdk-waf (~> 1.43.0)
-    train-core (3.10.1)
+    train-core (3.8.5)
      addressable (~> 2.5)
      ffi (!= 1.13.0)
      json (>= 1.8, < 3.0)
@ -614,7 +608,7 @@ GEM
      net-scp (>= 1.2, < 4.0)
      net-ssh (>= 2.9, < 7.0)
    train-habitat (0.2.22)
-    train-winrm (0.2.13)
+    train-winrm (0.2.12)
      winrm (>= 2.3.6, < 3.0)
      winrm-elevated (~> 1.2.2)
      winrm-fs (~> 1.0)
@ -641,8 +635,8 @@ GEM
    uber (0.1.0)
    unf (0.1.4)
      unf_ext
-    unf_ext (0.0.8.2)
-    unicode-display_width (2.2.0)
+    unf_ext (0.0.8)
+    unicode-display_width (2.1.0)
    unicode_utils (1.4.0)
    winrm (2.3.6)
      builder (>= 2.1.2)
@ -663,6 +657,7 @@ GEM
      rubyzip (~> 2.0)
      winrm (~> 2.0)
    wisper (2.0.1)
+    zeitwerk (2.5.1)

 PLATFORMS
  ruby
@ -671,7 +666,7 @@ DEPENDENCIES
  inspec!
  kitchen-docker!
  kitchen-inspec (>= 2.5.0)
-  kitchen-salt (>= 0.7.2)
+  kitchen-salt (>= 0.6.3)
  kitchen-vagrant

 BUNDLED WITH
--- a/bin/kitchen
+++ b/bin/kitchen
@ -19,8 +19,8 @@ if File.file?(bundle_binstub)
    load(bundle_binstub)
  else
    abort(
-      'Your `bin/bundle` was not generated by Bundler, ' \
-      'so this binstub cannot run.  Replace `bin/bundle` by running ' \
+      'Your `bin/bundle` was not generated by Bundler, '\
+      'so this binstub cannot run.  Replace `bin/bundle` by running '\
      '`bundle binstubs bundler --force`, then run this command again.'
    )
  end
--- a/docs/AUTHORS.rst
+++ b/docs/AUTHORS.rst
@ -15,10 +15,10 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - Contributions
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
     - `@myii <https://github.com/myii>`_
-     - 299
+     - 243
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>`
     - `@aboe76 <https://github.com/aboe76>`_
-     - 102
+     - 101
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
     - `@gravyboat <https://github.com/gravyboat>`_
     - 71
@ -27,13 +27,13 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - 54
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>`
     - `@noelmcloughlin <https://github.com/noelmcloughlin>`_
-     - 43
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
-     - `@javierbertoli <https://github.com/javierbertoli>`_
-     - 23
+     - 40
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>`
     - `@iggy <https://github.com/iggy>`_
     - 22
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
+     - `@javierbertoli <https://github.com/javierbertoli>`_
+     - 22
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>`
     - `@puneetk <https://github.com/puneetk>`_
     - 21
@ -45,15 +45,15 @@ This list is sorted by the number of commits per contributor in *descending* ord
     - 13
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/4195158?v=4' width='36' height='36' alt='@dafyddj'>`
     - `@dafyddj <https://github.com/dafyddj>`_
-     - 13
+     - 12
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>`
     - `@whiteinge <https://github.com/whiteinge>`_
     - 12
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1013915?v=4' width='36' height='36' alt='@rhertzog'>`
     - `@rhertzog <https://github.com/rhertzog>`_
     - 12
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@wwentland'>`
-     - `@wwentland <https://github.com/wwentland>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen'>`
+     - `@babilen <https://github.com/babilen>`_
     - 8
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/306240?v=4' width='36' height='36' alt='@UtahDave'>`
     - `@UtahDave <https://github.com/UtahDave>`_
@ -67,9 +67,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3045456?v=4' width='36' height='36' alt='@bradthurber'>`
     - `@bradthurber <https://github.com/bradthurber>`_
     - 6
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>`
-     - `@pprkut <https://github.com/pprkut>`_
-     - 6
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/7406466?v=4' width='36' height='36' alt='@fizmat'>`
     - `@fizmat <https://github.com/fizmat>`_
     - 6
@ -94,6 +91,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>`
     - `@EvaSDK <https://github.com/EvaSDK>`_
     - 4
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/56635?v=4' width='36' height='36' alt='@pprkut'>`
+     - `@pprkut <https://github.com/pprkut>`_
+     - 4
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/41886?v=4' width='36' height='36' alt='@jbouse'>`
     - `@jbouse <https://github.com/jbouse>`_
     - 4
@ -112,18 +112,15 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/90042?v=4' width='36' height='36' alt='@kev009'>`
     - `@kev009 <https://github.com/kev009>`_
     - 3
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/299386?v=4' width='36' height='36' alt='@excavador'>`
+     - `@excavador <https://github.com/excavador>`_
+     - 3
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/21147643?v=4' width='36' height='36' alt='@vquiering'>`
     - `@vquiering <https://github.com/vquiering>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>`
-     - `@ze42 <https://github.com/ze42>`_
-     - 3
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2377054?v=4' width='36' height='36' alt='@smlloyd'>`
     - `@smlloyd <https://github.com/smlloyd>`_
     - 3
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
-     - `@daks <https://github.com/daks>`_
-     - 3
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3280630?v=4' width='36' height='36' alt='@cackovic'>`
     - `@cackovic <https://github.com/cackovic>`_
     - 2
@ -184,12 +181,15 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/13768037?v=4' width='36' height='36' alt='@hkbakke'>`
     - `@hkbakke <https://github.com/hkbakke>`_
     - 2
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
-     - `@sticky-note <https://github.com/sticky-note>`_
-     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/398720?v=4' width='36' height='36' alt='@tiger-seo'>`
     - `@tiger-seo <https://github.com/tiger-seo>`_
     - 2
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2089076?v=4' width='36' height='36' alt='@ze42'>`
+     - `@ze42 <https://github.com/ze42>`_
+     - 2
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>`
+     - `@daks <https://github.com/daks>`_
+     - 2
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/5922290?v=4' width='36' height='36' alt='@major0'>`
     - `@major0 <https://github.com/major0>`_
     - 2
@ -205,8 +205,8 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3441274?v=4' width='36' height='36' alt='@ernstae'>`
     - `@ernstae <https://github.com/ernstae>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurzenika'>`
-     - `@arthurzenika <https://github.com/arthurzenika>`_
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/445200?v=4' width='36' height='36' alt='@arthurlogilab'>`
+     - `@arthurlogilab <https://github.com/arthurlogilab>`_
     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/3058109?v=4' width='36' height='36' alt='@kakwa'>`
     - `@kakwa <https://github.com/kakwa>`_
@ -229,9 +229,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/2487617?v=4' width='36' height='36' alt='@mecavity'>`
     - `@mecavity <https://github.com/mecavity>`_
     - 1
-   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/10227523?v=4' width='36' height='36' alt='@llua'>`
-     - `@llua <https://github.com/llua>`_
-     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/30061305?v=4' width='36' height='36' alt='@felix-russell'>`
     - `@felix-russell <https://github.com/felix-russell>`_
     - 1
@ -331,6 +328,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/1610361?v=4' width='36' height='36' alt='@mechleg'>`
     - `@mechleg <https://github.com/mechleg>`_
     - 1
+   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/46799934?v=4' width='36' height='36' alt='@sticky-note'>`
+     - `@sticky-note <https://github.com/sticky-note>`_
+     - 1
   * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars.githubusercontent.com/u/542613?v=4' width='36' height='36' alt='@bersace'>`
     - `@bersace <https://github.com/bersace>`_
     - 1
@ -338,4 +338,4 @@ This list is sorted by the number of commits per contributor in *descending* ord

 ----

-Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-08-26.
+Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2021-12-04.
--- a/docs/CHANGELOG.rst
+++ b/docs/CHANGELOG.rst
@ -2,158 +2,6 @@
 Changelog
 =========

-`1.12.0 <https://github.com/saltstack-formulas/salt-formula/compare/v1.11.0...v1.12.0>`_ (2022-08-26)
---------------------------------------------------------------------------------------------------------
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* update ``pre-commit`` configuration inc. for pre-commit.ci [skip ci] (\ `c8f9dd4 <https://github.com/saltstack-formulas/salt-formula/commit/c8f9dd44e610b250dc85a1e1f9c5475866902b5c>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **freebsd:** update package names for Python 3.9 (\ `2881fdd <https://github.com/saltstack-formulas/salt-formula/commit/2881fdd81136b1d57ae493dcb58b2b79947f6d0a>`_\ )
-
-`1.11.0 <https://github.com/saltstack-formulas/salt-formula/compare/v1.10.3...v1.11.0>`_ (2022-05-17)
---------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **minion:** replace literals with ``rootuser`` & ``rootgroup`` from map (\ `b2316ed <https://github.com/saltstack-formulas/salt-formula/commit/b2316ed17b7c60e5a4ee394f18fcad70572dc53d>`_\ )
-
-Code Refactoring
-^^^^^^^^^^^^^^^^
-
-
-* **minion:** use ``pkg.installed`` state for macOS (\ `3eff2d2 <https://github.com/saltstack-formulas/salt-formula/commit/3eff2d2acf43eb87015007fdfc5dd92bb8edaaf7>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **macos:** enable testing using GitHub Actions (\ `8ab60b9 <https://github.com/saltstack-formulas/salt-formula/commit/8ab60b9689158035a4d60a165729135b086e499d>`_\ )
-* **vagrant:** use ``linked_clone`` at all times (inc. CI) [skip ci] (\ `18a6230 <https://github.com/saltstack-formulas/salt-formula/commit/18a62308564faefa53cfc2b535a7fb9763c0c130>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **macos:** use ``saltstack`` as package to install (\ `c05fddf <https://github.com/saltstack-formulas/salt-formula/commit/c05fddf139e2a7ba9032ed1d1710929b9679b59c>`_\ )
-
-Tests
-^^^^^
-
-
-* **macos:** add ``map.jinja`` verification files (\ `c1c635f <https://github.com/saltstack-formulas/salt-formula/commit/c1c635fda48384c13284fbb424c88a1bfd3f0486>`_\ )
-* **macos:** update for this platform (\ `dc9cff9 <https://github.com/saltstack-formulas/salt-formula/commit/dc9cff99c5bcc487a68f488bbe419758ac72987c>`_\ )
-* **system.rb:** add support for ``mac_os_x`` [skip ci] (\ `e8a1237 <https://github.com/saltstack-formulas/salt-formula/commit/e8a12376324a1ae6a62485da6b84ccb3df8ac484>`_\ )
-
-`1.10.3 <https://github.com/saltstack-formulas/salt-formula/compare/v1.10.2...v1.10.3>`_ (2022-04-13)
---------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **pkgrepo:** pkgrepo use cmd.shell (\ `0e4b3bd <https://github.com/saltstack-formulas/salt-formula/commit/0e4b3bdf945d89cc8a4cc614fbe2073426363dff>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **kitchen.windows:** fix version number for Salt installation [skip ci] (\ `37dd068 <https://github.com/saltstack-formulas/salt-formula/commit/37dd068d199b4ee049c31807ecf34dfadec0179b>`_\ )
-
-Tests
-^^^^^
-
-
-* **_mapdata:** add verification file for ``fedora-36`` [skip ci] (\ `c20deb9 <https://github.com/saltstack-formulas/salt-formula/commit/c20deb92d48e26a83732eefa196f2f08d6548bff>`_\ )
-
-`1.10.2 <https://github.com/saltstack-formulas/salt-formula/compare/v1.10.1...v1.10.2>`_ (2022-04-03)
---------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **gentoo:** use ``retry_options`` to avoid spurious service failures (\ `d00c069 <https://github.com/saltstack-formulas/salt-formula/commit/d00c069e25463e6e675b0cea9f625a6e78985744>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `92a82a9 <https://github.com/saltstack-formulas/salt-formula/commit/92a82a98c72e5297caf08e1e135b72d09c2e4149>`_\ )
-* update linters to latest versions [skip ci] (\ `47efbc0 <https://github.com/saltstack-formulas/salt-formula/commit/47efbc04920a3f20ef9a69350b1ee46bbee11b37>`_\ )
-
-Tests
-^^^^^
-
-
-* **_mapdata:** add/update verification files for Fedora & Gentoo (\ `e9cb3d2 <https://github.com/saltstack-formulas/salt-formula/commit/e9cb3d27284d81115bac16c3af225c4b25eebaf9>`_\ )
-* **system:** add ``build_platform_codename`` [skip ci] (\ `6b5598a <https://github.com/saltstack-formulas/salt-formula/commit/6b5598a8d8d91ccc367283f80d5c736c7eb0168c>`_\ )
-
-`1.10.1 <https://github.com/saltstack-formulas/salt-formula/compare/v1.10.0...v1.10.1>`_ (2022-02-03)
---------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **minion:** respect ``minion_remove_config: true`` (\ `02c31df <https://github.com/saltstack-formulas/salt-formula/commit/02c31df0c5cca2863a46fd3c517a6610bb331548>`_\ ), closes `#527 <https://github.com/saltstack-formulas/salt-formula/issues/527>`_
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **gemfile:** allow rubygems proxy to be provided as an env var [skip ci] (\ `46fc639 <https://github.com/saltstack-formulas/salt-formula/commit/46fc639d46bedfe0489ed66719534384fcc84757>`_\ )
-* **kitchen+gitlab:** update for new pre-salted images [skip ci] (\ `d95dac2 <https://github.com/saltstack-formulas/salt-formula/commit/d95dac24aadd343bf92a976a59e0a72be6ade2d8>`_\ )
-* **windows:** update Salt version installed to ``3004-3`` [skip ci] (\ `fdccb9b <https://github.com/saltstack-formulas/salt-formula/commit/fdccb9b6125acbc90d1a596553eced7525af4a47>`_\ )
-* **windows:** use Salt version ``3004`` [skip ci] (\ `a1e9823 <https://github.com/saltstack-formulas/salt-formula/commit/a1e9823b42205f1442d3bea2037936b64760a8b6>`_\ )
-
-Tests
-^^^^^
-
-
-* update for new pre-salted images [skip ci] (\ `8015fe0 <https://github.com/saltstack-formulas/salt-formula/commit/8015fe0c9252d80c8c63aa08a1a0152e0eba279b>`_\ )
-
-`1.10.0 <https://github.com/saltstack-formulas/salt-formula/compare/v1.9.10...v1.10.0>`_ (2021-12-27)
---------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **log_fmt_console:** double option in config (\ `b705e44 <https://github.com/saltstack-formulas/salt-formula/commit/b705e44378dc8905e4394362c55cd757afb88be7>`_\ )
-* **minion:** fix windows path construction (\ `c9c6e12 <https://github.com/saltstack-formulas/salt-formula/commit/c9c6e1222396ef3105c19bb7d4e9e8f1670fd700>`_\ )
-
-Continuous Integration
-^^^^^^^^^^^^^^^^^^^^^^
-
-
-* **proxy:** replace deprecated Windows ``2016`` with ``2022`` [skip ci] (\ `21b8d36 <https://github.com/saltstack-formulas/salt-formula/commit/21b8d3626e4f356b43cac8098f5f9be334840818>`_\ )
-* **proxy+windows:** fix setting up WinRM [skip ci] (\ `39cbc1b <https://github.com/saltstack-formulas/salt-formula/commit/39cbc1b91bfe5c46664ca2a74233b62f99ac3850>`_\ )
-* **vagrant:** replace FreeBSD 12.2 with 12.3 [skip ci] (\ `1654e67 <https://github.com/saltstack-formulas/salt-formula/commit/1654e6746b4e0c18d2a88fa2afe678f6f5bb5238>`_\ )
-
-Features
-^^^^^^^^
-
-
-* **minion:** ensure correct permissions for salt-cloud generated files (\ `dfa7f7d <https://github.com/saltstack-formulas/salt-formula/commit/dfa7f7d1d8fd02c928a71415b49c408446e09423>`_\ )
-
-`1.9.10 <https://github.com/saltstack-formulas/salt-formula/compare/v1.9.9...v1.9.10>`_ (2021-12-19)
--------------------------------------------------------------------------------------------------------
-
-Bug Fixes
-^^^^^^^^^
-
-
-* **minion:** update config parameter saltenv (\ `7540dc9 <https://github.com/saltstack-formulas/salt-formula/commit/7540dc90aa32976640a298db16c0219173994e4a>`_\ )
-
 `1.9.9 <https://github.com/saltstack-formulas/salt-formula/compare/v1.9.8...v1.9.9>`_ (2021-12-04)
 ------------------------------------------------------------------------------------------------------

--- a/kitchen.macos.yml
+++ b/kitchen.macos.yml
@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
---
-driver:
-  name: exec
-
-provisioner:
-  sudo: true
-  salt_install: bootstrap
-  salt_bootstrap_options: -P stable latest
-  salt_call_command: /opt/salt/bin/salt-call
-
-platforms:
-  - name: macos-12-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: macos-11-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: macos-1015-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
--- a/kitchen.vagrant.yml
+++ b/kitchen.vagrant.yml
@ -9,8 +9,8 @@ driver:
  gui: false
  ssh:
    shell: /bin/sh
-  linked_clone: true
  <% unless ENV['CI'] %>
+  linked_clone: true
  synced_folders:
    - - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
      - '/vagrant'
@ -21,24 +21,26 @@ platforms:
  - name: freebsd-130-master-py3
    driver:
      box: myii/freebsd-13.0-master-py3
+      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: freebsd-123-master-py3
+  - name: freebsd-122-master-py3
    driver:
-      box: myii/freebsd-12.3-master-py3
+      box: myii/freebsd-12.2-master-py3
    verifier:
      inputs:
        saltmajorversion: 3004
  - name: freebsd-130-3004-0-py3
    driver:
      box: myii/freebsd-13.0-3004.0-py3
+      synced_folders: []  # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=255208
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: freebsd-123-3004-0-py3
+  - name: freebsd-122-3004-0-py3
    driver:
-      box: myii/freebsd-12.3-3004.0-py3
+      box: myii/freebsd-12.2-3004.0-py3
    verifier:
      inputs:
        saltmajorversion: 3004
@ -51,6 +53,15 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3003
+  - name: openbsd-69-3002-6-py3
+    driver:
+      box: myii/openbsd-6.9-3002.6-py3
+      ssh:
+        shell: /bin/ksh
+      synced_folders: []
+    verifier:
+      inputs:
+        saltmajorversion: 3002
  - name: windows-10-latest-py3
    driver:
      box: techneg/win10x64-pro-salt
@ -67,14 +78,14 @@ platforms:
          C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base `
          -ErrorAction SilentlyContinue
        salt-call --local state.single file.managed `
-          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
-          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
+          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
          skip_verify=True makedirs=True
        exit 0
      # yamllint enable rule:line-length
    verifier:
      inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3003
  - name: windows-81-latest-py3
    driver:
      box: techneg/win81x64-pro-salt
@ -91,11 +102,11 @@ platforms:
          C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base `
          -ErrorAction SilentlyContinue
        salt-call --local state.single file.managed `
-          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
-          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
+          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
          skip_verify=True makedirs=True
        exit 0
      # yamllint enable rule:line-length
    verifier:
      inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3003
--- a/kitchen.windows.yml
+++ b/kitchen.windows.yml
@ -11,21 +11,21 @@ driver:

 provisioner:
  salt_install: bootstrap
-  salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1
+  salt_bootstrap_options: -pythonVersion 3 -version 3003.3
  # yamllint disable rule:line-length
  init_environment: |
-    salt-call --local state.single file.managed `
-      C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
-      source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
+    C:\salt\salt-call --local state.single file.managed `
+      C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
+      source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
      skip_verify=True makedirs=True
  # yamllint enable rule:line-length

 platforms:
-  - name: windows-2022-latest-py3
-    verifier:
-      inputs:
-        saltmajorversion: 3004
  - name: windows-2019-latest-py3
    verifier:
      inputs:
-        saltmajorversion: 3004
+        saltmajorversion: 3003
+  - name: windows-2016-latest-py3
+    verifier:
+      inputs:
+        saltmajorversion: 3003
--- a/kitchen.yml
+++ b/kitchen.yml
@ -43,13 +43,6 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: ubuntu-2204-tiamat-py3
-    driver:
-      image: saltimages/salt-tiamat-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
  - name: ubuntu-2004-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:ubuntu-20.04
@ -70,6 +63,12 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
+  - name: centos-8-tiamat-py3
+    driver:
+      image: saltimages/salt-tiamat-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
  - name: centos-7-tiamat-py3
    driver:
      image: saltimages/salt-tiamat-py3:centos-7
@ -129,13 +128,6 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: ubuntu-2204-master-py3
-    driver:
-      image: saltimages/salt-master-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
  - name: ubuntu-2004-master-py3
    driver:
      image: saltimages/salt-master-py3:ubuntu-20.04
@ -156,21 +148,27 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
+  - name: centos-8-master-py3
+    driver:
+      image: saltimages/salt-master-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
  - name: centos-7-master-py3
    driver:
      image: saltimages/salt-master-py3:centos-7
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: fedora-36-master-py3
+  - name: fedora-34-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-36
+      image: saltimages/salt-master-py3:fedora-34
    verifier:
      inputs:
        saltmajorversion: 3004
-  - name: fedora-35-master-py3
+  - name: fedora-33-master-py3
    driver:
-      image: saltimages/salt-master-py3:fedora-35
+      image: saltimages/salt-master-py3:fedora-33
    verifier:
      inputs:
        saltmajorversion: 3004
@ -184,6 +182,16 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
+  - name: opensuse-leap-152-master-py3
+    driver:
+      image: saltimages/salt-master-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3004
  - name: opensuse-tmbl-latest-master-py3
    driver:
      image: saltimages/salt-master-py3:opensuse-tumbleweed-latest
@ -244,124 +252,72 @@ platforms:
      inputs:
        saltmajorversion: 3004

-  ## SALT `3004.1`
-  - name: debian-11-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-11
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: debian-10-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-10
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: debian-9-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:debian-9
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: ubuntu-2204-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-22.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: ubuntu-2004-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-20.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: ubuntu-1804-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:ubuntu-18.04
-      run_command: /lib/systemd/systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: centos-stream8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:centos-stream8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: centos-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:centos-7
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: fedora-36-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-36
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: fedora-35-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:fedora-35
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: amazonlinux-2-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:amazonlinux-2
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: oraclelinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: oraclelinux-7-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:oraclelinux-7
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: arch-base-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:arch-base-latest
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: gentoo-stage3-latest-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-latest
-      run_command: /sbin/init
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: gentoo-stage3-systemd-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:gentoo-stage3-systemd
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: almalinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:almalinux-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-  - name: rockylinux-8-3004-1-py3
-    driver:
-      image: saltimages/salt-3004.1-py3:rockylinux-8
-    verifier:
-      inputs:
-        saltmajorversion: 3004
-
  ## SALT `3004.0`
+  - name: debian-11-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-11
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: debian-10-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-10
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: debian-9-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:debian-9
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: ubuntu-2004-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: ubuntu-1804-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: centos-stream8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-stream8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: centos-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: centos-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: fedora-34-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: fedora-33-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3004
  - name: opensuse-leap-153-3004-0-py3
    driver:
      image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
@ -372,6 +328,16 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
+  - name: opensuse-leap-152-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3004
  - name: opensuse-tmbl-latest-3004-0-py3
    driver:
      image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
@ -382,72 +348,444 @@ platforms:
    verifier:
      inputs:
        saltmajorversion: 3004
+  - name: amazonlinux-2-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: oraclelinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: oraclelinux-7-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: arch-base-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: gentoo-stage3-latest-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: gentoo-stage3-systemd-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: almalinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:almalinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004
+  - name: rockylinux-8-3004-0-py3
+    driver:
+      image: saltimages/salt-3004.0-py3:rockylinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3004

-  ## SALT `3003.4`
-  - name: debian-10-3003-4-py3
+  ## SALT `3003.3`
+  - name: debian-11-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-10
+      image: saltimages/salt-3003.3-py3:debian-11
      run_command: /lib/systemd/systemd
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: debian-9-3003-4-py3
+  - name: debian-10-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:debian-9
+      image: saltimages/salt-3003.3-py3:debian-10
      run_command: /lib/systemd/systemd
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: ubuntu-2004-3003-4-py3
+  - name: debian-9-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-20.04
+      image: saltimages/salt-3003.3-py3:debian-9
      run_command: /lib/systemd/systemd
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: ubuntu-1804-3003-4-py3
+  - name: ubuntu-2004-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:ubuntu-18.04
+      image: saltimages/salt-3003.3-py3:ubuntu-20.04
      run_command: /lib/systemd/systemd
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: centos-stream8-3003-4-py3
+  - name: ubuntu-1804-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-stream8
+      image: saltimages/salt-3003.3-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: centos-7-3003-4-py3
+  - name: centos-stream8-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:centos-7
+      image: saltimages/salt-3003.3-py3:centos-stream8
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: amazonlinux-2-3003-4-py3
+  - name: centos-8-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:amazonlinux-2
+      image: saltimages/salt-3003.3-py3:centos-8
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: oraclelinux-8-3003-4-py3
+  - name: centos-7-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-8
+      image: saltimages/salt-3003.3-py3:centos-7
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: oraclelinux-7-3003-4-py3
+  - name: fedora-34-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:oraclelinux-7
+      image: saltimages/salt-3003.3-py3:fedora-34
    verifier:
      inputs:
        saltmajorversion: 3003
-  - name: almalinux-8-3003-4-py3
+  - name: fedora-33-3003-3-py3
    driver:
-      image: saltimages/salt-3003.4-py3:almalinux-8
+      image: saltimages/salt-3003.3-py3:fedora-33
    verifier:
      inputs:
        saltmajorversion: 3003
+  - name: opensuse-leap-153-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: opensuse-leap-152-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: opensuse-tmbl-latest-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: amazonlinux-2-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: oraclelinux-8-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: oraclelinux-7-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: arch-base-latest-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: gentoo-stage3-latest-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: gentoo-stage3-systemd-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+  - name: almalinux-8-3003-3-py3
+    driver:
+      image: saltimages/salt-3003.3-py3:almalinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3003
+
+  ## SALT `3002.7`
+  - name: debian-11-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:debian-11
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: debian-10-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:debian-10
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: debian-9-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:debian-9
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: ubuntu-2004-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: ubuntu-1804-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: centos-8-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: centos-7-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: fedora-34-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: fedora-33-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: opensuse-leap-153-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: opensuse-leap-152-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: opensuse-tmbl-latest-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: amazonlinux-2-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: oraclelinux-8-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: oraclelinux-7-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: arch-base-latest-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: gentoo-stage3-latest-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+  - name: gentoo-stage3-systemd-3002-7-py3
+    driver:
+      image: saltimages/salt-3002.7-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3002
+
+  ## SALT `3001.8`
+  - name: debian-10-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:debian-10
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: debian-9-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:debian-9
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: ubuntu-2004-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:ubuntu-20.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: ubuntu-1804-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:ubuntu-18.04
+      run_command: /lib/systemd/systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: centos-8-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:centos-8
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: centos-7-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:centos-7
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: fedora-34-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:fedora-34
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: fedora-33-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:fedora-33
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: opensuse-leap-153-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:opensuse-leap-15.3
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: opensuse-leap-152-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:opensuse-leap-15.2
+    # Workaround to avoid intermittent failures on `opensuse-leap-15.2`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: opensuse-tmbl-latest-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:opensuse-tumbleweed-latest
+    # Workaround to avoid intermittent failures on `opensuse-tumbleweed`:
+    # => SCP did not finish successfully (255):  (Net::SCP::Error)
+    transport:
+      max_ssh_sessions: 1
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: amazonlinux-2-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:amazonlinux-2
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: oraclelinux-8-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:oraclelinux-8
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: oraclelinux-7-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:oraclelinux-7
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: arch-base-latest-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:arch-base-latest
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: gentoo-stage3-latest-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:gentoo-stage3-latest
+      run_command: /sbin/init
+    verifier:
+      inputs:
+        saltmajorversion: 3001
+  - name: gentoo-stage3-systemd-3001-8-py3
+    driver:
+      image: saltimages/salt-3001.8-py3:gentoo-stage3-systemd
+    verifier:
+      inputs:
+        saltmajorversion: 3001

 verifier:
  # https://www.inspec.io/
--- a/pre-commit_semantic-release.sh
+++ b/pre-commit_semantic-release.sh
@ -7,16 +7,16 @@ sed -i -e "s_^\(version:\).*_\1 ${1}_" FORMULA


 ###############################################################################
-# (B) Use `m2r2` to convert automatically produced `.md` docs to `.rst`
+# (B) Use `m2r` to convert automatically produced `.md` docs to `.rst`
 ###############################################################################

-# Install `m2r2`
-pip3 install m2r2
+# Install `m2r`
+pip3 install m2r

 # Copy and then convert the `.md` docs
 cp ./*.md docs/
 cd docs/ || exit
-m2r2 --overwrite ./*.md
+m2r --overwrite ./*.md

 # Change excess `H1` headings to `H2` in converted `CHANGELOG.rst`
 sed -i -e '/^=.*$/s/=/-/g' CHANGELOG.rst
--- a/salt/api.sls
+++ b/salt/api.sls
@ -15,7 +15,7 @@ salt-api:
  service.{{ salt_settings.api_service_details.state }}:
    - enable: {{ salt_settings.api_service_details.enabled }}
    - name: {{ salt_settings.api_service }}
-    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
+    {%- if grains.os_family == 'FreeBSD' %}
    - retry: {{ salt_settings.retry_options | json }}
    {%- endif %}
    - require:
--- a/salt/files/master.d/f_defaults.conf
+++ b/salt/files/master.d/f_defaults.conf
@ -1594,7 +1594,7 @@ mine_get:
 # the coloring of the messages, these color formatters also include padding as
 # well.  Color LogRecord attributes are only available for console logging.
 #
-#log_fmt_console "%(colorlevel)s %(colormsg)s"
+{{ get_config('log_fmt_console', "'%(colorlevel)s %(colormsg)s'") }}
 {{ get_config('log_fmt_console', "'[%(levelname)-8s] %(message)s'") }}

 {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }}
--- a/salt/files/minion.d/f_defaults.conf
+++ b/salt/files/minion.d/f_defaults.conf
@ -1085,7 +1085,7 @@ ext_pillar:
 # the coloring of the messages, these color formatters also include padding as
 # well.  Color LogRecord attributes are only available for console logging.
 #
-#log_fmt_console "%(colorlevel)s %(colormsg)s"
+{{ get_config('log_fmt_console', "'%(colorlevel)s %(colormsg)s'") }}
 {{ get_config('log_fmt_console', "'[%(levelname)-8s] %(message)s'") }}
 #
 {{ get_config('log_fmt_logfile', "'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s] %(message)s'") }}
--- a/salt/master.sls
+++ b/salt/master.sls
@ -54,7 +54,7 @@ salt-master:
  service.{{ salt_settings.master_service_details.state }}:
    - enable: {{ salt_settings.master_service_details.enabled }}
    - name: {{ salt_settings.master_service }}
-    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
+    {%- if grains.os_family == 'FreeBSD' %}
    - retry: {{ salt_settings.retry_options | json }}
    {%- endif %}
    - watch:
--- a/salt/minion.sls
+++ b/salt/minion.sls
@ -20,8 +20,8 @@ download-salt-minion:
                    {% else %}
    - skip_verify: True
                    {% endif %}
-    - user: {{ salt_settings.rootuser }}
-    - group: {{ salt_settings.rootgroup }}
+    - user: root
+    - group: wheel
    - mode: '0644'
    - unless:
      - test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
@ -29,13 +29,10 @@ download-salt-minion:
      - macpackage: salt-minion
    - retry: {{ salt_settings.retry_options | json }}
            {%- elif "workaround https://github.com/saltstack/salt/issues/49348" %}
-  {% if salt_settings.install_packages %}
-  pkg.installed:
-    - name: {{ salt_settings.salt_minion }}
-    {%- if salt_settings.version is defined %}
-    - version: {{ salt_settings.version }}
-    {%- endif %}
-  {% endif %}
+  cmd.run:
+    - name: /usr/local/bin/brew install {{ salt_settings.salt_minion }}
+    - onlyif: test -x /usr/local/bin/brew
+    - runas: {{ salt_settings.rootuser }}
            {%- endif %}

 salt-minion-macos:
@ -81,7 +78,7 @@ salt-minion:
        {%- endif %}
    {% endif %}
  file.recurse:
-    - name: {{ salt_settings.config_path | path_join('minion.d') }}
+    - name: {{ salt_settings.config_path }}/minion.d
    {%- if salt_settings.minion_config_use_TOFS %}
    - template: ''
    - source: {{ files_switch(['minion.d'],
@ -100,7 +97,7 @@ salt-minion:
  service.{{ salt_settings.minion_service_details.state }}:
    - enable: {{ salt_settings.minion_service_details.enabled }}
    - name: {{ salt_settings.minion_service }}
-    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
+    {%- if grains.os_family == 'FreeBSD' %}
    - retry: {{ salt_settings.retry_options | json }}
    {%- endif %}
    - watch:
@ -133,7 +130,7 @@ salt-minion:
            {%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
      - macpackage: salt-minion
            {%- elif grains.os == 'MacOS' %}
-      - pkg: download-salt-minion
+      - cmd: download-salt-minion
            {%- else %}
      - pkg: salt-minion
            {%- endif %}
@ -158,7 +155,7 @@ restart-salt-minion:
            {%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
      - macpackage: salt-minion
            {%- elif grains.os == 'MacOS' %}
-      - pkg: download-salt-minion
+      - cmd: download-salt-minion
            {%- else %}
      - pkg: salt-minion
            {%- endif %}
@ -186,7 +183,7 @@ remove-default-minion-conf-file:
 # clean up old _defaults.conf file if they have it around
 remove-old-minion-conf-file:
  file.absent:
-    - name: {{ salt_settings.config_path | path_join('minion.d', '_defaults.conf') }}
+    - name: {{ salt_settings.config_path }}/minion.d/_defaults.conf

    {% if grains.os == 'MacOS' %}
 remove-macpackage-salt:
@ -194,85 +191,3 @@ remove-macpackage-salt:
    - name: /tmp/salt.pkg
    - force: True
    {% endif %}
-
-    {% if not salt_settings.minion_remove_config %}
-permissions-minion-config:
-  file.managed:
-    - name: {{ salt_settings.config_path | path_join('minion') }}
-    - user: {{ salt_settings.rootuser }}
-    - group:
-        {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
-        wheel
-        {%- else %}
-        {{ salt_settings.rootgroup }}
-        {%- endif %}
-    {%- if grains['kernel'] != 'Windows' %}
-    - mode: 640
-    {% endif %}
-    - replace: False
-    {% endif %}
-
-salt-minion-pki-dir:
-  file.directory:
-{% if 'pki_dir' in salt_settings.minion %}
-    - name: {{ salt_settings.minion.pki_dir }}
-{% else %}
-    - name: {{ salt_settings.config_path | path_join('pki', 'minion') }}
-{% endif %}
-    - user: {{ salt_settings.rootuser }}
-    - group: salt
-{#
-        {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
-        wheel
-        {%- else %}
-        {{ salt_settings.rootgroup }}
-        {%- endif %}
-#}
-    {%- if grains['kernel'] != 'Windows' %}
-    - mode: 750
-    {% endif %}
-    - makedirs: True
-
-permissions-minion.pem:
-  file.managed:
-{% if 'pki_dir' in salt_settings.minion %}
-    - name: {{ salt_settings.minion.pki_dir | path_join('minion.pem') }}
-{% else %}
-    - name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pem') }}
-{% endif %}
-    - user: {{ salt_settings.rootuser }}
-    - group: salt
-{#
-        {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
-        wheel
-        {%- else %}
-        {{ salt_settings.rootgroup }}
-        {%- endif %}
-#}
-    {%- if grains['kernel'] != 'Windows' %}
-    - mode: 440
-    {% endif %}
-    - replace: False
-    - require:
-      - file: salt-minion-pki-dir
-
-permissions-minion.pub:
-  file.managed:
-{% if 'pki_dir' in salt_settings.minion %}
-    - name: {{ salt_settings.minion.pki_dir | path_join('minion.pub') }}
-{% else %}
-    - name: {{ salt_settings.config_path | path_join('pki', 'minion', 'minion.pub') }}
-{% endif %}
-    - user: {{ salt_settings.rootuser }}
-    - group:
-        {%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
-        wheel
-        {%- else %}
-        {{ salt_settings.rootgroup }}
-        {%- endif %}
-    {%- if grains['kernel'] != 'Windows' %}
-    - mode: 644
-    {% endif %}
-    - replace: False
-    - require:
-      - file: salt-minion-pki-dir
--- a/salt/osfamilymap.yaml
+++ b/salt/osfamilymap.yaml
@ -138,7 +138,6 @@ Windows:
  rootuser: {{ rootuser | d('') }}

 MacOS:
-  salt_master: saltstack
  salt_minion: salt
  salt_minion_pkg_source: ''
  salt_minion_pkg_hash: ''
--- a/salt/osmap.yaml
+++ b/salt/osmap.yaml
@ -66,15 +66,15 @@ MacOS:
  salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20

 FreeBSD:
-  salt_master: py39-salt
-  salt_minion: py39-salt
-  salt_syndic: py39-salt
-  salt_cloud: py39-salt
-  salt_api: py39-salt
-  salt_ssh: py39-salt
-  python_git: py39-gitpython
-  pygit2: py39-pygit2
-  python_dulwich: py39-dulwich
+  salt_master: py38-salt
+  salt_minion: py38-salt
+  salt_syndic: py38-salt
+  salt_cloud: py38-salt
+  salt_api: py38-salt
+  salt_ssh: py38-salt
+  python_git: py38-gitpython
+  pygit2: py38-pygit2
+  python_dulwich: py38-dulwich

 # If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
 # since this is probably specific to `OpenBSD-6`
--- a/salt/pkgrepo/suse/install.sls
+++ b/salt/pkgrepo/suse/install.sls
@ -4,7 +4,7 @@

 {#- Resorting to this ugly hack since the state doesn't handle if the `baseurl` is
    already configured under another name, such as used by the `salt-bootstrap` #}
-{%- if not salt["cmd.shell"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %}
+{%- if not salt["cmd.run"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %}
 salt-pkgrepo-install-saltstack-suse:
  pkgrepo.managed:
    - name: systemsmanagement_saltstack_products
--- a/salt/standalone.sls
+++ b/salt/standalone.sls
@ -25,7 +25,7 @@ salt-minion-standalone:
    - enable: False
  {%- endif %}
    - name: {{ salt_settings.minion_service }}
-    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
+    {%- if grains.os_family == 'FreeBSD' %}
    - retry: {{ salt_settings.retry_options | json }}
    {%- endif %}
    - require:
--- a/salt/syndic.sls
+++ b/salt/syndic.sls
@ -18,7 +18,7 @@ salt-syndic:
  service.running:
    - enable: True
    - name: {{ salt_settings.syndic_service }}
-    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
+    {%- if grains.os_family == 'FreeBSD' %}
    - retry: {{ salt_settings.retry_options | json }}
    {%- endif %}
    - require:
--- a/test/integration/default/controls/pkgs_spec.rb
+++ b/test/integration/default/controls/pkgs_spec.rb
@ -5,11 +5,9 @@ pkgs =
  when 'arch'
    %w[salt]
  when /bsd$/
-    %w[py39-salt]
+    %w[py38-salt]
  when 'windows'
    ['Salt Minion']
-  when 'mac_os_x'
-    %w[salt saltstack]
  else
    %w[salt-master salt-minion]
  end
--- a/test/integration/default/controls/service_spec.rb
+++ b/test/integration/default/controls/service_spec.rb
@ -6,14 +6,6 @@ services =
    %w[salt_master salt_minion]
  when 'windows'
    %w[salt-minion]
-  when 'darwin'
-    # The following is expected but isn't yet working in the GitHub Actions
-    # macOS runners
-    # %w[com.saltstack.salt.api
-    #    com.saltstack.salt.master
-    #    com.saltstack.salt.minion
-    #    com.saltstack.salt.syndic]
-    []
  else
    %w[salt-master salt-minion]
  end
--- a/test/integration/default/files/_mapdata/debian-9.yaml
+++ b/test/integration/default/files/_mapdata/debian-9.yaml
@ -88,14 +88,14 @@ values:
    parallel: true
    pin_version: false
    pkgrepo: deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64]
-      https://repo.saltproject.io/py3/debian/9/amd64/3003 stretch main
-    pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3003/salt-archive-keyring.gpg
+      https://repo.saltproject.io/py3/debian/9/amd64/3002 stretch main
+    pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg
    pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
    py_ver: py3
    pyinotify: python-pyinotify
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3003'
+    release: '3002'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/fedora-34.yaml
+++ b/test/integration/default/files/_mapdata/fedora-34.yaml
@ -42,7 +42,7 @@ values:
          version: 0.23.0
        version: 0.23.0
    install_packages: true
-    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub
+    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003/SALTSTACK-GPG-KEY.pub
    master:
      ext_pillar:
      - cmd_yaml: cat /etc/salt/yaml
@ -87,14 +87,14 @@ values:
      state: running
    parallel: true
    pin_version: false
-    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004
+    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3003
    pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
    pkgrepo_name: saltstack
    py_ver: py3
    pygit2: python2-pygit2
    python_dulwich: python-dulwich
    python_git: GitPython
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/fedora-35.yaml
+++ b/test/integration/default/files/_mapdata/fedora-35.yaml
@ -1,117 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-35
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: /srv/formulas
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: /etc/salt
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: false
-        libgit2:
-          build_parent_dir: /usr/src/
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-          - /path/to/stack1.cfg
-          - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: /srv/saltclass
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: pygit2
-      pillar_roots:
-        base:
-        - /srv/pillar
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: salt-master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - /srv/pillar
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: salt-minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: true
-    pin_version: false
-    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004
-    pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
-    pkgrepo_name: saltstack
-    py_ver: py3
-    pygit2: python2-pygit2
-    python_dulwich: python-dulwich
-    python_git: GitPython
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: root
-    rootuser: root
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: salt-master
-    salt_master_macos_plist_hash: ''
-    salt_minion: salt-minion
-    salt_minion_macos_plist_hash: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/fedora-36.yaml
+++ b/test/integration/default/files/_mapdata/fedora-36.yaml
@ -1,117 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Fedora-36
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: /srv/formulas
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: /etc/salt
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: false
-        libgit2:
-          build_parent_dir: /usr/src/
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    key_url: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004/SALTSTACK-GPG-KEY.pub
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-          - /path/to/stack1.cfg
-          - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: /srv/saltclass
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: pygit2
-      pillar_roots:
-        base:
-        - /srv/pillar
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: salt-master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - /srv/pillar
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: salt-minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: true
-    pin_version: false
-    pkgrepo: https://repo.saltproject.io/py3/redhat/$releasever/$basearch/3004
-    pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
-    pkgrepo_name: saltstack
-    py_ver: py3
-    pygit2: python2-pygit2
-    python_dulwich: python-dulwich
-    python_git: GitPython
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: root
-    rootuser: root
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: salt-master
-    salt_master_macos_plist_hash: ''
-    salt_minion: salt-minion
-    salt_minion_macos_plist_hash: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/freebsd-12.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-12.yaml
@ -88,9 +88,9 @@ values:
    pin_version: false
    pkgrepo: ''
    py_ver: py3
-    pygit2: py39-pygit2
-    python_dulwich: py39-dulwich
-    python_git: py39-gitpython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
    release: '3004'
    restart_via_at: false
    retry_options:
@ -100,14 +100,14 @@ values:
      until: true
    rootgroup: wheel
    rootuser: root
-    salt_api: py39-salt
-    salt_cloud: py39-salt
-    salt_master: py39-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
    salt_master_macos_plist_hash: ''
-    salt_minion: py39-salt
+    salt_minion: py38-salt
    salt_minion_macos_plist_hash: ''
-    salt_ssh: py39-salt
-    salt_syndic: py39-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
    ssh_roster: {}
    syndic_service: salt_syndic
    use_pip: false
--- a/test/integration/default/files/_mapdata/freebsd-13.yaml
+++ b/test/integration/default/files/_mapdata/freebsd-13.yaml
@ -88,9 +88,9 @@ values:
    pin_version: false
    pkgrepo: ''
    py_ver: py3
-    pygit2: py39-pygit2
-    python_dulwich: py39-dulwich
-    python_git: py39-gitpython
+    pygit2: py38-pygit2
+    python_dulwich: py38-dulwich
+    python_git: py38-gitpython
    release: '3004'
    restart_via_at: false
    retry_options:
@ -100,14 +100,14 @@ values:
      until: true
    rootgroup: wheel
    rootuser: root
-    salt_api: py39-salt
-    salt_cloud: py39-salt
-    salt_master: py39-salt
+    salt_api: py38-salt
+    salt_cloud: py38-salt
+    salt_master: py38-salt
    salt_master_macos_plist_hash: ''
-    salt_minion: py39-salt
+    salt_minion: py38-salt
    salt_minion_macos_plist_hash: ''
-    salt_ssh: py39-salt
-    salt_syndic: py39-salt
+    salt_ssh: py38-salt
+    salt_syndic: py38-salt
    ssh_roster: {}
    syndic_service: salt_syndic
    use_pip: false
--- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
@ -91,7 +91,7 @@ values:
    pyinotify: dev-python/pyinotify
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
+++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
@ -91,7 +91,7 @@ values:
    pyinotify: dev-python/pyinotify
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/mac_os_x-10.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-10.yaml
@ -1,115 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Mac OS X
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: /srv/formulas
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: /private/etc/salt
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: true
-        libgit2:
-          build_parent_dir: /usr/src/
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-        - /path/to/stack1.cfg
-        - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: /srv/saltclass
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: gitpython
-      pillar_roots:
-        base:
-        - /srv/pillar
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: com.saltstack.salt.master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - /srv/pillar
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: com.saltstack.salt.minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: true
-    pin_version: false
-    pkgrepo: ''
-    py_ver: py3
-    python_dulwich: python-dulwich
-    python_git: python-git
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: staff
-    rootuser: runner
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: saltstack
-    salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
-    salt_minion: salt
-    salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
-    salt_minion_pkg_hash: ''
-    salt_minion_pkg_source: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/mac_os_x-11.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-11.yaml
@ -1,115 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Mac OS X
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: /srv/formulas
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: /private/etc/salt
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: true
-        libgit2:
-          build_parent_dir: /usr/src/
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-        - /path/to/stack1.cfg
-        - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: /srv/saltclass
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: gitpython
-      pillar_roots:
-        base:
-        - /srv/pillar
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: com.saltstack.salt.master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - /srv/pillar
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: com.saltstack.salt.minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: true
-    pin_version: false
-    pkgrepo: ''
-    py_ver: py3
-    python_dulwich: python-dulwich
-    python_git: python-git
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: staff
-    rootuser: runner
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: saltstack
-    salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
-    salt_minion: salt
-    salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
-    salt_minion_pkg_hash: ''
-    salt_minion_pkg_source: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/mac_os_x-12.yaml
+++ b/test/integration/default/files/_mapdata/mac_os_x-12.yaml
@ -1,115 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Mac OS X
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: /srv/formulas
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: /private/etc/salt
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: true
-        libgit2:
-          build_parent_dir: /usr/src/
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-        - /path/to/stack1.cfg
-        - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: /srv/saltclass
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: gitpython
-      pillar_roots:
-        base:
-        - /srv/pillar
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: com.saltstack.salt.master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - /srv/salt
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - /srv/pillar
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: com.saltstack.salt.minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: true
-    pin_version: false
-    pkgrepo: ''
-    py_ver: py3
-    python_dulwich: python-dulwich
-    python_git: python-git
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: staff
-    rootuser: runner
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: saltstack
-    salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
-    salt_minion: salt
-    salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
-    salt_minion_pkg_hash: ''
-    salt_minion_pkg_source: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/opensuse-15.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-15.yaml
@ -94,7 +94,7 @@ values:
    pyinotify: python-pyinotify
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
+++ b/test/integration/default/files/_mapdata/opensuse-tumbleweed.yaml
@ -94,7 +94,7 @@ values:
    pyinotify: python-pyinotify
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/windows-10.yaml
+++ b/test/integration/default/files/_mapdata/windows-10.yaml
@ -90,7 +90,7 @@ values:
    py_ver: py3
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/windows-2019-server.yaml
+++ b/test/integration/default/files/_mapdata/windows-2019-server.yaml
@ -90,7 +90,7 @@ values:
    py_ver: py3
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/files/_mapdata/windows-2022-server.yaml
+++ b/test/integration/default/files/_mapdata/windows-2022-server.yaml
@ -1,113 +0,0 @@
-# yamllint disable rule:indentation rule:line-length
-# Windows-2022Server
---
-values:
-  formulas_settings:
-    checkout_orig_branch: false
-    git_opts:
-      default:
-        basedir: "/srv/formulas"
-        baseurl: https://github.com/saltstack-formulas
-        options:
-          output_loglevel: quiet
-          rev: master
-        update: false
-    list: {}
-  salt_settings:
-    api_service: salt-api
-    api_service_details:
-      enabled: true
-      state: running
-    clean_config_d_dir: true
-    cloud:
-      template_sources:
-        maps: salt://salt/files/cloud.maps.d
-        profiles: salt://salt/files/cloud.profiles.d
-        providers: salt://salt/files/cloud.providers.d
-    config_path: C:\salt\conf
-    gitfs:
-      dulwich:
-        install_from_source: true
-      gitpython:
-        install_from_source: false
-      pygit2:
-        git:
-          install_from_package: git
-          require_state: false
-        install_from_source: true
-        libgit2:
-          build_parent_dir: "/usr/src/"
-          download_hash: 683d1164e361e2a0a8d52652840e2340
-          install_from_source: true
-          version: 0.23.0
-        version: 0.23.0
-    install_packages: true
-    master:
-      ext_pillar:
-      - cmd_yaml: cat /etc/salt/yaml
-      - stack:
-          - /path/to/stack1.cfg
-          - /path/to/stack2.cfg
-      - reclass:
-          inventory_base_uri: /etc/reclass
-      - saltclass:
-        - path: "/srv/saltclass"
-      file_roots:
-        base:
-        - "/srv/salt"
-      fileserver_backend:
-      - rootfs
-      gitfs_provider: gitpython
-      pillar_roots:
-        base:
-        - "/srv/pillar"
-    master_config_use_TOFS: false
-    master_remove_config: false
-    master_service: salt-master
-    master_service_details:
-      enabled: true
-      state: running
-    minion:
-      file_roots:
-        base:
-        - "/srv/salt"
-      fileserver_backend:
-      - rootfs
-      master: localhost
-      master_type: str
-      pillar_roots:
-        base:
-        - "/srv/pillar"
-    minion_config_use_TOFS: false
-    minion_remove_config: false
-    minion_service: salt-minion
-    minion_service_details:
-      enabled: true
-      state: running
-    parallel: false
-    pin_version: false
-    pkgrepo: ''
-    py_ver: py3
-    python_dulwich: python-dulwich
-    python_git: python-git
-    release: '3004'
-    restart_via_at: false
-    retry_options:
-      attempts: 5
-      interval: 10
-      splay: 10
-      until: true
-    rootgroup: root
-    rootuser: kitchen
-    salt_api: salt-api
-    salt_cloud: salt-cloud
-    salt_master: salt-master
-    salt_master_macos_plist_hash: ''
-    salt_minion: salt-minion-py3
-    salt_minion_macos_plist_hash: ''
-    salt_ssh: salt-ssh
-    salt_syndic: salt-syndic
-    ssh_roster: {}
-    syndic_service: salt-syndic
-    use_pip: false
-    version: ''
--- a/test/integration/default/files/_mapdata/windows-8.yaml
+++ b/test/integration/default/files/_mapdata/windows-8.yaml
@ -90,7 +90,7 @@ values:
    py_ver: py3
    python_dulwich: python-dulwich
    python_git: python-git
-    release: '3004'
+    release: '3003'
    restart_via_at: false
    retry_options:
      attempts: 5
--- a/test/integration/default/inspec.yml
+++ b/test/integration/default/inspec.yml
@ -24,5 +24,4 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
-  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/inspec.yml
+++ b/test/integration/share/inspec.yml
@ -21,5 +21,4 @@ supports:
  - platform-name: gentoo
  - platform-name: almalinux
  - platform-name: rocky
-  - platform-name: mac_os_x
  - platform: windows
--- a/test/integration/share/libraries/system.rb
+++ b/test/integration/share/libraries/system.rb
@ -4,7 +4,6 @@
 # Author: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
 # Copyright (C) 2020 Daniel Dehennin <daniel.dehennin@ac-dijon.fr>

-# rubocop:disable Metrics/ClassLength
 class SystemResource < Inspec.resource(1)
  name 'system'

@ -22,8 +21,7 @@ class SystemResource < Inspec.resource(1)
      family: build_platform_family,
      name: build_platform_name,
      release: build_platform_release,
-      finger: build_platform_finger,
-      codename: build_platform_codename
+      finger: build_platform_finger
    }
  end

@ -57,16 +55,12 @@ class SystemResource < Inspec.resource(1)
      'base-latest'
    when 'gentoo'
      "#{inspec.platform[:release].split('.')[0]}-#{derive_gentoo_init_system}"
-    when 'mac_os_x'
-      inspec.command('sw_vers -productVersion').stdout.to_s
    when 'opensuse'
      # rubocop:disable Style/NumericLiterals,Layout/LineLength
      inspec.platform[:release].to_i > 20210101 ? 'tumbleweed' : inspec.platform[:release]
      # rubocop:enable Style/NumericLiterals,Layout/LineLength
    when 'windows_8.1_pro'
      '8.1'
-    when 'windows_server_2022_datacenter'
-      '2022-server'
    when 'windows_server_2019_datacenter'
      '2019-server'
    when 'windows_server_2016_datacenter'
@ -93,46 +87,4 @@ class SystemResource < Inspec.resource(1)
      build_platform_release.split('.')[0]
    end
  end
-
-  # rubocop:disable Metrics/MethodLength,Metrics/CyclomaticComplexity
-  def build_platform_codename
-    case build_platform_finger
-    when 'ubuntu-22.04'
-      'jammy'
-    when 'ubuntu-20.04'
-      'focal'
-    when 'ubuntu-18.04'
-      'bionic'
-    when 'debian-11'
-      'bullseye'
-    when 'debian-10'
-      'buster'
-    when 'debian-9'
-      'stretch'
-    when 'almalinux-8'
-      "AlmaLinux #{build_platform_release} (Arctic Sphynx)"
-    when 'amazonlinux-2'
-      'Amazon Linux 2'
-    when 'arch-base-latest'
-      'Arch Linux'
-    when 'centos-7'
-      'CentOS Linux 7 (Core)'
-    when 'centos-8'
-      'CentOS Stream 8'
-    when 'opensuse-tumbleweed'
-      'openSUSE Tumbleweed'
-    when 'opensuse-15'
-      "openSUSE Leap #{build_platform_release}"
-    when 'oraclelinux-8', 'oraclelinux-7'
-      "Oracle Linux Server #{build_platform_release}"
-    when 'gentoo-2-sysd', 'gentoo-2-sysv'
-      'Gentoo/Linux'
-    when 'rockylinux-8'
-      "Rocky Linux #{build_platform_release} (Green Obsidian)"
-    else
-      ''
-    end
-  end
-  # rubocop:enable Metrics/MethodLength,Metrics/CyclomaticComplexity
 end
-# rubocop:enable Metrics/ClassLength
--- a/test/salt/pillar/top.sls
+++ b/test/salt/pillar/top.sls
@ -8,4 +8,8 @@ base:
    - v3004-py3
  'G@saltversioninfo:0:3003 and G@pythonversion:0:3':
    - v3003-py3
+  'G@saltversioninfo:0:3002 and G@pythonversion:0:3':
+    - v3002-py3
+  'G@saltversioninfo:0:3001 and G@pythonversion:0:3':
+    - v3001-py3
 ...
--- a/test/salt/pillar/v3001-py3.sls
+++ b/test/salt/pillar/v3001-py3.sls
@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+salt:
+  release: '3001'