Salt/salt-formula
0
0
Fork 0
mirror of https://github.com/saltstack-formulas/salt-formula.git synced 2026-04-18 12:42:49 +02:00
Code Issues Activity

chore: apply template copier-ssf-ci at version v2.0.0

Browse Source
This commit is contained in:
Dafydd Jones 2025-06-10 00:12:27 +01:00
parent bf52207a9b
commit 5f4333cebc
15 changed files with 904 additions and 860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.copier-answers.ssf-ci.yml Normal file
View File

@ -0,0 +1,20 @@
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: v2.0.0
_src_path: https://github.com/dafyddj/copier-ssf-ci
failure_permitted_ignored: []
failure_permitted_patterns: []
formula_name: salt
renovate_extend_presets:
- github>saltstack-formulas/.github
- github>saltstack-formulas/.github:copier
renovate_ignore_presets: []
supported_oses:
- AlmaLinux OS
- Amazon Linux
- CentOS
- Debian
- Fedora Linux
- openSUSE
- Oracle Linux
- Rocky Linux
- Ubuntu

11
.github/renovate.json5 vendored Normal file
View File

@ -0,0 +1,11 @@
{
$schema: 'https://docs.renovatebot.com/renovate-schema.json',
extends: [
"github>saltstack-formulas/.github",
"github>saltstack-formulas/.github:copier"
],
/**********************************************************
* This file is managed as part of a Copier template. *
* Please make your own changes below this comment. *
*********************************************************/
}

8
.github/settings.yml vendored Normal file
View File

@ -0,0 +1,8 @@
---
# These settings are synced to GitHub by https://probot.github.io/apps/settings/
repository:
# See https://docs.github.com/en/rest/reference/repos#update-a-repository
# for all available settings
allow_squash_merge: false

60
.github/workflows/main.yml vendored Normal file
View File

@ -0,0 +1,60 @@
---
# yamllint disable rule:comments
name: Test & release
'on':
- pull_request
- push
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: ${{ github.ref != format('refs/heads/{0}',
github.event.repository.default_branch) }}
jobs:
should-run:
name: Prep / Should run
runs-on: ubuntu-latest
timeout-minutes: 5
outputs:
should-run: ${{ steps.action.outputs.should-run }}
steps:
- id: action
uses:
# yamllint disable-line rule:line-length
techneg-it/should-workflow-run@dcbb88600d59ec2842778ef1e2d41f680f876329 # v1.0.0
pre-commit:
name: Lint / `pre-commit`
needs: should-run
if: fromJSON(needs.should-run.outputs.should-run)
container: techneg/ci-pre-commit:v2.3.3
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Export `CI_CACHE_ID` from container
run: echo "CI_CACHE_ID=$(cat /.ci_cache_id)" >> $GITHUB_ENV
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
with:
path: ~/.cache/pre-commit
key: "${{ env.CI_CACHE_ID }}|\
${{ hashFiles('.pre-commit-config.yaml') }}"
- name: Run `pre-commit`
run: |
git config --global --add safe.directory $(pwd)
pre-commit run --all-files --color always --verbose
pre-commit run --color always --hook-stage manual commitlint-ci
results:
name: Release / Collect results
permissions:
checks: read
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
# yamllint disable-line rule:line-length
- uses: poseidon/wait-for-status-checks@899c768d191b56eef585c18f8558da19e1f3e707 # v0.6.0
with:
ignore: Release / Collect results
ignore_pattern: ^GitLab CI
token: ${{ secrets.GITHUB_TOKEN }}
- run: echo "::notice ::Workflow success!"

211
.gitlab-ci.yml
View File

@ -9,45 +9,82 @@
only_branch_master_parent_repo: &only_branch_master_parent_repo
- 'master@saltstack-formulas/salt-formula'
# `stage`
stage_cache: &stage_cache 'cache'
stage_lint: &stage_lint 'lint'
stage_release: &stage_release 'release'
stage_test: &stage_test 'test'
# `image`
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
image_dindruby: &image_dindruby 'dafyddj/ci-dind-python-ruby:2.0.2'
image_precommit: &image_precommit 'dafyddj/ci-pre-commit:2.1.0'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14'
# yamllint disable rule:line-length
image_commitlint: &image_commitlint 'techneg/ci-commitlint:v1.1.90@sha256:8334132f86e7241ed7eb5ac6469aa1a44c68f2b0923349209e7a7f403de18c97'
image_dindruby: &image_dindruby 'techneg/ci-docker-python-ruby:v2.2.59@sha256:df2308e9c162f73c2094a913dcd29baccb07e3fd677418a74437e7780a7bcd1b'
image_dindrubybionic: &image_dindrubybionic 'techneg/ci-docker-python-ruby:v2.2.59@sha256:df2308e9c162f73c2094a913dcd29baccb07e3fd677418a74437e7780a7bcd1b'
image_precommit: &image_precommit 'techneg/ci-pre-commit:v2.4.24@sha256:0508ba9bb36bbfe9c12da5745cfb85159cdfbf8453c64fb63c9ca4d6e6cca679'
image_rubocop: &image_rubocop 'pipelinecomponents/rubocop:latest@sha256:fe69f9642c7edde46bbd78326d2c42c6e13fc73694efb142e92e206725479328'
image_semantic-release: &image_semanticrelease 'myii/ssf-semantic-release:15.14@sha256:374f588420087517a3cc0235e11293bffd72d7a59da3d98d5e69f014ff2a7761'
# `services`
services_docker_dind: &services_docker_dind
- 'docker:dind'
- 'docker:28.2.2-dind@sha256:bbc590727c1e4fe707877314ff4f0f977bdda2985c485f2b044db0e18979efb3'
# yamllint enable rule:line-length
# `variables`
# https://forum.gitlab.com/t/gitlab-com-ci-caching-rubygems/5627/3
# https://bundler.io/v1.16/bundle_config.html
# https://bundler.io/v2.3/man/bundle-config.1.html
variables_bundler: &variables_bundler
BUNDLE_CACHE_PATH: '${CI_PROJECT_DIR}/.cache/bundler'
BUNDLE_WITHOUT: 'production'
# `cache`
BUNDLE_PATH: '${CI_PROJECT_DIR}/.cache/bundler'
BUNDLE_DEPLOYMENT: 'true'
bundle_install: &bundle_install
- 'bundle version'
- 'bundle config list'
# `--no-cache` means don't bother caching the downloaded .gem files
- 'time bundle install --no-cache'
cache_bundler: &cache_bundler
key: '${CI_JOB_STAGE}'
key:
files:
- 'Gemfile.lock'
prefix: 'bundler'
paths:
- '${BUNDLE_CACHE_PATH}'
- '${BUNDLE_PATH}'
# https://pre-commit.com/#gitlab-ci-example
variables_pre-commit: &variables_pre-commit
PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit'
cache_pre-commit: &cache_pre-commit
key:
files:
- '.pre-commit-config.yaml'
prefix: 'pre-commit'
paths:
- '${PRE_COMMIT_HOME}'
###############################################################################
# Define stages and global variables
###############################################################################
stages:
- *stage_cache
- *stage_lint
- *stage_test
- *stage_release
variables:
DOCKER_DRIVER: 'overlay2'
###############################################################################
# `cache` stage: build up the bundler cache required before the `test` stage
###############################################################################
build-cache:
stage: *stage_cache
image: *image_dindruby
variables: *variables_bundler
cache: *cache_bundler
script: *bundle_install
###############################################################################
# `lint` stage: `commitlint`, `pre-commit` & `rubocop` (latest, failure allowed)
###############################################################################
commitlint:
.lint_job:
stage: *stage_lint
needs: []
commitlint:
extends: '.lint_job'
image: *image_commitlint
script:
# Add `upstream` remote to get access to `upstream/master`
@ -72,17 +109,14 @@ commitlint:
--verbose'
pre-commit:
stage: *stage_lint
extends: '.lint_job'
image: *image_precommit
# https://pre-commit.com/#gitlab-ci-example
variables:
PRE_COMMIT_HOME: '${CI_PROJECT_DIR}/.cache/pre-commit'
cache:
key: '${CI_JOB_NAME}'
paths:
- '${PRE_COMMIT_HOME}'
variables: *variables_pre-commit
cache: *cache_pre-commit
script:
- 'pre-commit run --all-files --color always --verbose'
- 'pre-commit run --color always --hook-stage manual commitlint-ci'
# Use a separate job for `rubocop` other than the one potentially run by `pre-commit`
# - The `pre-commit` check will only be available for formulas that pass the default
@ -91,8 +125,8 @@ pre-commit:
# - Furthermore, this job uses all of the latest `rubocop` features & cops,
# which will help when upgrading the `rubocop` linter used in `pre-commit`
rubocop:
extends: '.lint_job'
allow_failure: true
stage: *stage_lint
image: *image_rubocop
script:
- 'rubocop -d -P -S --enable-pending-cops'
@ -105,12 +139,10 @@ rubocop:
image: *image_dindruby
services: *services_docker_dind
variables: *variables_bundler
cache: *cache_bundler
before_script:
# TODO: This should work from the env vars above automatically
- 'bundle config set path "${BUNDLE_CACHE_PATH}"'
- 'bundle config set without "${BUNDLE_WITHOUT}"'
- 'bundle install'
cache:
<<: *cache_bundler
policy: 'pull'
before_script: *bundle_install
script:
# Alternative value to consider: `${CI_JOB_NAME}`
- 'bin/kitchen verify "${DOCKER_ENV_CI_JOB_NAME}"'
@ -129,69 +161,68 @@ rubocop:
# 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-7-tiamat-py3: {extends: '.test_instance'}
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
# default-almalinux-8-tiamat-py3: {extends: '.test_instance'}
# default-rockylinux-8-tiamat-py3: {extends: '.test_instance'}
# 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-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-opensuse-leap-153-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'}
# default-oraclelinux-7-master-py3: {extends: '.test_instance'}
# default-arch-base-latest-master-py3: {extends: '.test_instance'}
# default-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
# 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'}
# Fedora 41+ will permit failure until this PR is merged into kitchen-docker
# https://github.com/test-kitchen/kitchen-docker/pull/427 is merged
# OpenSUSE master branch will fail until zypperpkg module is back in salt core
# https://github.com/saltstack/great-module-migration/issues/14
#
almalinux-9-master: {extends: '.test_instance_failure_permitted'}
almalinux-8-master: {extends: '.test_instance_failure_permitted'}
amazonlinux-2023-master: {extends: '.test_instance_failure_permitted'}
amazonlinux-2-master: {extends: '.test_instance_failure_permitted'}
centos-stream9-master: {extends: '.test_instance_failure_permitted'}
debian-12-master: {extends: '.test_instance_failure_permitted'}
debian-11-master: {extends: '.test_instance_failure_permitted'}
fedora-41-master: {extends: '.test_instance_failure_permitted'}
fedora-40-master: {extends: '.test_instance_failure_permitted'}
opensuse-leap-156-master: {extends: '.test_instance_failure_permitted'}
opensuse-leap-155-master: {extends: '.test_instance_failure_permitted'}
opensuse-tmbl-latest-master: {extends: '.test_instance_failure_permitted'}
oraclelinux-9-master: {extends: '.test_instance_failure_permitted'}
oraclelinux-8-master: {extends: '.test_instance_failure_permitted'}
rockylinux-9-master: {extends: '.test_instance_failure_permitted'}
rockylinux-8-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2404-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2204-master: {extends: '.test_instance_failure_permitted'}
ubuntu-2004-master: {extends: '.test_instance_failure_permitted'}
almalinux-9-3007-3: {extends: '.test_instance'}
almalinux-8-3007-3: {extends: '.test_instance'}
amazonlinux-2023-3007-3: {extends: '.test_instance'}
amazonlinux-2-3007-3: {extends: '.test_instance_failure_permitted'}
centos-stream9-3007-3: {extends: '.test_instance'}
debian-12-3007-3: {extends: '.test_instance'}
debian-11-3007-3: {extends: '.test_instance'}
fedora-41-3007-3: {extends: '.test_instance_failure_permitted'}
fedora-40-3007-3: {extends: '.test_instance'}
opensuse-leap-156-3007-3: {extends: '.test_instance'}
opensuse-leap-155-3007-3: {extends: '.test_instance'}
opensuse-tmbl-latest-3007-3: {extends: '.test_instance'}
oraclelinux-9-3007-3: {extends: '.test_instance'}
oraclelinux-8-3007-3: {extends: '.test_instance'}
rockylinux-9-3007-3: {extends: '.test_instance'}
rockylinux-8-3007-3: {extends: '.test_instance'}
ubuntu-2404-3007-3: {extends: '.test_instance'}
ubuntu-2204-3007-3: {extends: '.test_instance'}
ubuntu-2004-3007-3: {extends: '.test_instance'}
almalinux-9-3006-11: {extends: '.test_instance'}
almalinux-8-3006-11: {extends: '.test_instance'}
amazonlinux-2023-3006-11: {extends: '.test_instance'}
amazonlinux-2-3006-11: {extends: '.test_instance_failure_permitted'}
centos-stream9-3006-11: {extends: '.test_instance'}
debian-12-3006-11: {extends: '.test_instance'}
debian-11-3006-11: {extends: '.test_instance'}
fedora-41-3006-11: {extends: '.test_instance_failure_permitted'}
fedora-40-3006-11: {extends: '.test_instance'}
opensuse-leap-156-3006-11: {extends: '.test_instance'}
opensuse-leap-155-3006-11: {extends: '.test_instance'}
opensuse-tmbl-latest-3006-11: {extends: '.test_instance'}
oraclelinux-9-3006-11: {extends: '.test_instance'}
oraclelinux-8-3006-11: {extends: '.test_instance'}
rockylinux-9-3006-11: {extends: '.test_instance'}
rockylinux-8-3006-11: {extends: '.test_instance'}
ubuntu-2404-3006-11: {extends: '.test_instance'}
ubuntu-2204-3006-11: {extends: '.test_instance'}
ubuntu-2004-3006-11: {extends: '.test_instance'}
# yamllint enable rule:line-length
###############################################################################

53
.pre-commit-config.yaml
View File

@ -15,24 +15,26 @@ ci:
autoupdate_schedule: quarterly
skip: []
submodules: false
default_stages: [commit]
default_stages: [pre-commit]
repos:
- repo: https://github.com/dafyddj/commitlint-pre-commit-hook
rev: v2.3.0
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v5.0.0
hooks:
- id: check-merge-conflict
name: Check for Git merge conflicts
args: [--assume-in-merge]
exclude: ^docs/AUTHORS.rst$
- repo: https://github.com/dafyddj/mirrors-commitlint
rev: v19.8.1
hooks:
- id: commitlint
name: Check commit message using commitlint
description: Lint commit message against @commitlint/config-conventional rules
stages: [commit-msg]
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
- id: commitlint-ci
- repo: https://github.com/rubocop-hq/rubocop
rev: v1.57.0
rev: v1.75.8
hooks:
- id: rubocop
name: Check Ruby files with rubocop
args: [--debug]
always_run: true
pass_filenames: false
- repo: https://github.com/shellcheck-py/shellcheck-py
rev: v0.9.0.6
hooks:
@ -41,7 +43,7 @@ repos:
files: ^.*\.(sh|bash|ksh)$
types: []
- repo: https://github.com/adrienverge/yamllint
rev: v1.32.0
rev: v1.37.1
hooks:
- id: yamllint
name: Check YAML syntax with yamllint
@ -55,6 +57,7 @@ repos:
# 1. SLS files under directory `test/` which are state files
# 2. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
# 3. YAML files heavily reliant on Jinja
# 4. `.copier-answers.yml` and its variants which are auto-generated
files: |
(?x)^(
.*\.yaml|
@ -66,11 +69,9 @@ repos:
)$
exclude: |
(?x)^(
\.copier-answers(\..+)?\.ya?ml|
kitchen.vagrant.yml|
test/.*/states/.*\.sls|
salt/osfamilymap.yaml|
salt/osmap.yaml|
salt/osfingermap.yaml
test/.*/states/.*\.sls
)$
- repo: https://github.com/warpnet/salt-lint
rev: v0.9.2
@ -78,15 +79,15 @@ repos:
- id: salt-lint
name: Check Salt files using salt-lint
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
- repo: https://github.com/myint/rstcheck
rev: v6.2.0
- repo: https://github.com/rstcheck/rstcheck
rev: v6.2.5
hooks:
- id: rstcheck
name: Check reST files using rstcheck
exclude: 'docs/CHANGELOG.rst'
additional_dependencies: [sphinx==7.2.6]
- repo: https://github.com/saltstack-formulas/mirrors-rst-lint
rev: v1.3.2
rev: v1.4.0
hooks:
- id: rst-lint
name: Check reST files using rst-lint
@ -94,5 +95,21 @@ repos:
(?x)^(
docs/CHANGELOG.rst|
docs/TOFS_pattern.rst|
docs/CONTRIBUTING_DOCS.rst|
docs/index.rst|
)$
additional_dependencies: [pygments==2.16.1]
- repo: https://github.com/renovatebot/pre-commit-hooks
rev: 40.36.8
hooks:
- id: renovate-config-validator
name: Check Renovate config with renovate-config-validator
- repo: https://github.com/python-jsonschema/check-jsonschema
rev: 0.33.0
hooks:
- id: check-github-workflows
name: Check GitHub workflows with check-jsonschema
args: [--verbose]
- id: check-gitlab-ci
name: Check GitLab CI config with check-jsonschema
args: [--verbose]

4
.rstcheck.cfg
View File

@ -1,4 +1,6 @@
[rstcheck]
report=info
ignore_language=rst
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$)
# salt['config.get']('roles') is misidentified as a Markdown link.
# Ignore for now, but perhaps try to submit a fix upstream in rstcheck
ignore_messages=(Duplicate (ex|im)plicit target.*|Hyperlink target ".*" is not referenced\.$|\(rst\) Link is formatted in Markdown style\.)

2
.rubocop.yml
View File

@ -7,7 +7,7 @@ Layout/LineLength:
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
Max: 88
Metrics/BlockLength:
IgnoredMethods:
AllowedMethods:
- control
- describe
# Increase from default of `25`

8
Gemfile
View File

@ -15,12 +15,10 @@ gem 'inspec', git: 'https://gitlab.com/saltstack-formulas/infrastructure/inspec'
gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker', branch: 'ssf'
# rubocop:enable Layout/LineLength
gem 'kitchen-inspec', '>= 2.5.0'
gem 'kitchen-salt', '>= 0.7.2'
gem 'kitchen-inspec', '2.6.2'
gem 'kitchen-salt', '0.7.2'
# Avoid the error 'pkeys are immutable on OpenSSL 3.0'
gem 'net-ssh', '>= 7.0.0'
group :vagrant do
gem 'kitchen-vagrant'
end
gem 'test-kitchen', '3.6.0'

755
Gemfile.lock
View File

File diff suppressed because it is too large Load Diff

6
commitlint.config.js
View File

@ -5,4 +5,10 @@ module.exports = {
'footer-max-line-length': [2, 'always', 120],
'header-max-length': [2, 'always', 72],
},
ignores: [
(commit) => commit.startsWith("chore(copier):"),
(commit) => commit.startsWith("chore(deps):"),
(commit) => commit.startsWith("ci(pre-commit.ci):"),
(commit) => commit.startsWith("[CI merge]")
],
};

526
kitchen.yml
View File

@ -20,434 +20,240 @@ provisioner:
pillars_from_directories:
- test/salt/pillar
platforms:
## SALT `tiamat`
- name: debian-11-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-10
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:debian-9
run_command: /lib/systemd/systemd
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
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: centos-stream8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3004
- name: centos-7-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:centos-7
verifier:
inputs:
saltmajorversion: 3004
- name: amazonlinux-2-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-7-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3004
- name: almalinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: rockylinux-8-tiamat-py3
driver:
image: saltimages/salt-tiamat-py3:rockylinux-8
verifier:
inputs:
saltmajorversion: 3004
transport:
# Avoid lengthy waits when a container does not launch correctly
max_wait_until_ready: 60
platforms:
## SALT `master`
- name: debian-11-master-py3
- name: debian-12-master
driver:
image: saltimages/salt-master-py3:debian-12
run_command: /lib/systemd/systemd
- name: debian-11-master
driver:
image: saltimages/salt-master-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-master-py3
- name: ubuntu-2404-master
driver:
image: saltimages/salt-master-py3:debian-10
image: saltimages/salt-master-py3:ubuntu-24.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-master-py3
driver:
image: saltimages/salt-master-py3:debian-9
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2204-master-py3
- name: ubuntu-2204-master
driver:
image: saltimages/salt-master-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2004-master-py3
- name: ubuntu-2004-master
driver:
image: saltimages/salt-master-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-master-py3
- name: centos-stream9-master
driver:
image: saltimages/salt-master-py3:ubuntu-18.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: centos-stream8-master-py3
image: saltimages/salt-master-py3:centos-stream9
- name: opensuse-leap-156-master
driver:
image: saltimages/salt-master-py3:centos-stream8
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
driver:
image: saltimages/salt-master-py3:fedora-36
verifier:
inputs:
saltmajorversion: 3004
- name: fedora-35-master-py3
driver:
image: saltimages/salt-master-py3:fedora-35
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-leap-153-master-py3
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.3
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
image: saltimages/salt-master-py3:opensuse-leap-15.6
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
verifier:
inputs:
saltmajorversion: 3004
- name: opensuse-tmbl-latest-master-py3
- name: opensuse-leap-155-master
driver:
image: saltimages/salt-master-py3:opensuse-leap-15.5
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-tmbl-latest-master
driver:
image: saltimages/salt-master-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: 3004
- name: amazonlinux-2-master-py3
- name: fedora-41-master
driver:
image: saltimages/salt-master-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-8-master-py3
image: saltimages/salt-master-py3:fedora-41
- name: fedora-40-master
driver:
image: saltimages/salt-master-py3:fedora-40
- name: amazonlinux-2023-master
driver:
image: saltimages/salt-master-py3:amazonlinux-2023
- name: oraclelinux-9-master
driver:
image: saltimages/salt-master-py3:oraclelinux-9
- name: oraclelinux-8-master
driver:
image: saltimages/salt-master-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: oraclelinux-7-master-py3
- name: almalinux-9-master
driver:
image: saltimages/salt-master-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3004
- name: arch-base-latest-master-py3
driver:
image: saltimages/salt-master-py3:arch-base-latest
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-latest-master-py3
driver:
image: saltimages/salt-master-py3:gentoo-stage3-latest
run_command: /sbin/init
verifier:
inputs:
saltmajorversion: 3004
- name: gentoo-stage3-systemd-master-py3
driver:
image: saltimages/salt-master-py3:gentoo-stage3-systemd
verifier:
inputs:
saltmajorversion: 3004
- name: almalinux-8-master-py3
image: saltimages/salt-master-py3:almalinux-9
- name: almalinux-8-master
driver:
image: saltimages/salt-master-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3004
- name: rockylinux-8-master-py3
- name: rockylinux-9-master
driver:
image: saltimages/salt-master-py3:rockylinux-9
- name: rockylinux-8-master
driver:
image: saltimages/salt-master-py3:rockylinux-8
verifier:
inputs:
saltmajorversion: 3004
## SALT `3004.1`
- name: debian-11-3004-1-py3
## SALT `3007.3`
- name: debian-12-3007-3
driver:
image: saltimages/salt-3004.1-py3:debian-11
image: saltimages/salt-3007.3-py3:debian-12
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-10-3004-1-py3
- name: debian-11-3007-3
driver:
image: saltimages/salt-3004.1-py3:debian-10
image: saltimages/salt-3007.3-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: debian-9-3004-1-py3
- name: ubuntu-2404-3007-3
driver:
image: saltimages/salt-3004.1-py3:debian-9
image: saltimages/salt-3007.3-py3:ubuntu-24.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2204-3004-1-py3
- name: ubuntu-2204-3007-3
driver:
image: saltimages/salt-3004.1-py3:ubuntu-22.04
image: saltimages/salt-3007.3-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-2004-3004-1-py3
- name: ubuntu-2004-3007-3
driver:
image: saltimages/salt-3004.1-py3:ubuntu-20.04
image: saltimages/salt-3007.3-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3004
- name: ubuntu-1804-3004-1-py3
- name: centos-stream9-3007-3
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
image: saltimages/salt-3007.3-py3:centos-stream9
- name: opensuse-leap-155-3007-3
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: opensuse-leap-153-3004-0-py3
driver:
image: saltimages/salt-3004.0-py3:opensuse-leap-15.3
# Workaround to avoid intermittent failures on `opensuse-leap-15.3`:
image: saltimages/salt-3007.3-py3:opensuse-leap-15.5
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
# => 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
- name: opensuse-leap-156-3007-3
driver:
image: saltimages/salt-3004.0-py3:opensuse-tumbleweed-latest
image: saltimages/salt-3007.3-py3:opensuse-leap-15.6
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-tmbl-latest-3007-3
driver:
image: saltimages/salt-3007.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: 3004
- name: fedora-41-3007-3
driver:
image: saltimages/salt-3007.3-py3:fedora-41
- name: fedora-40-3007-3
driver:
image: saltimages/salt-3007.3-py3:fedora-40
- name: amazonlinux-2023-3007-3
driver:
image: saltimages/salt-3007.3-py3:amazonlinux-2023
- name: amazonlinux-2-3007-3
driver:
image: saltimages/salt-3007.3-py3:amazonlinux-2
- name: oraclelinux-9-3007-3
driver:
image: saltimages/salt-3007.3-py3:oraclelinux-9
- name: oraclelinux-8-3007-3
driver:
image: saltimages/salt-3007.3-py3:oraclelinux-8
- name: almalinux-9-3007-3
driver:
image: saltimages/salt-3007.3-py3:almalinux-9
- name: almalinux-8-3007-3
driver:
image: saltimages/salt-3007.3-py3:almalinux-8
- name: rockylinux-9-3007-3
driver:
image: saltimages/salt-3007.3-py3:rockylinux-9
- name: rockylinux-8-3007-3
driver:
image: saltimages/salt-3007.3-py3:rockylinux-8
## SALT `3003.4`
- name: debian-10-3003-4-py3
## SALT `3006.11`
- name: debian-12-3006-11
driver:
image: saltimages/salt-3003.4-py3:debian-10
image: saltimages/salt-3006.11-py3:debian-12
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: debian-9-3003-4-py3
- name: debian-11-3006-11
driver:
image: saltimages/salt-3003.4-py3:debian-9
image: saltimages/salt-3006.11-py3:debian-11
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: ubuntu-2004-3003-4-py3
- name: ubuntu-2404-3006-11
driver:
image: saltimages/salt-3003.4-py3:ubuntu-20.04
image: saltimages/salt-3006.11-py3:ubuntu-24.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: ubuntu-1804-3003-4-py3
- name: ubuntu-2204-3006-11
driver:
image: saltimages/salt-3003.4-py3:ubuntu-18.04
image: saltimages/salt-3006.11-py3:ubuntu-22.04
run_command: /lib/systemd/systemd
verifier:
inputs:
saltmajorversion: 3003
- name: centos-stream8-3003-4-py3
- name: ubuntu-2004-3006-11
driver:
image: saltimages/salt-3003.4-py3:centos-stream8
verifier:
inputs:
saltmajorversion: 3003
- name: centos-7-3003-4-py3
image: saltimages/salt-3006.11-py3:ubuntu-20.04
run_command: /lib/systemd/systemd
- name: centos-stream9-3006-11
driver:
image: saltimages/salt-3003.4-py3:centos-7
verifier:
inputs:
saltmajorversion: 3003
- name: amazonlinux-2-3003-4-py3
image: saltimages/salt-3006.11-py3:centos-stream9
- name: opensuse-tmbl-latest-3006-11
driver:
image: saltimages/salt-3003.4-py3:amazonlinux-2
verifier:
inputs:
saltmajorversion: 3003
- name: oraclelinux-8-3003-4-py3
image: saltimages/salt-3006.11-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
- name: opensuse-leap-156-3006-11
driver:
image: saltimages/salt-3003.4-py3:oraclelinux-8
verifier:
inputs:
saltmajorversion: 3003
- name: oraclelinux-7-3003-4-py3
image: saltimages/salt-3006.11-py3:opensuse-leap-15.6
# Workaround to avoid intermittent failures on `opensuse-leap-15.6`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: opensuse-leap-155-3006-11
driver:
image: saltimages/salt-3003.4-py3:oraclelinux-7
verifier:
inputs:
saltmajorversion: 3003
- name: almalinux-8-3003-4-py3
image: saltimages/salt-3006.11-py3:opensuse-leap-15.5
# Workaround to avoid intermittent failures on `opensuse-leap-15.5`:
# => SCP did not finish successfully (255): (Net::SCP::Error)
transport:
max_ssh_sessions: 1
- name: fedora-41-3006-11
driver:
image: saltimages/salt-3003.4-py3:almalinux-8
verifier:
inputs:
saltmajorversion: 3003
image: saltimages/salt-3006.11-py3:fedora-41
- name: fedora-40-3006-11
driver:
image: saltimages/salt-3006.11-py3:fedora-40
- name: amazonlinux-2023-3006-11
driver:
image: saltimages/salt-3006.11-py3:amazonlinux-2023
- name: amazonlinux-2-3006-11
driver:
image: saltimages/salt-3006.11-py3:amazonlinux-2
- name: oraclelinux-9-3006-11
driver:
image: saltimages/salt-3006.11-py3:oraclelinux-9
- name: oraclelinux-8-3006-11
driver:
image: saltimages/salt-3006.11-py3:oraclelinux-8
- name: almalinux-9-3006-11
driver:
image: saltimages/salt-3006.11-py3:almalinux-9
- name: almalinux-8-3006-11
driver:
image: saltimages/salt-3006.11-py3:almalinux-8
- name: rockylinux-9-3006-11
driver:
image: saltimages/salt-3006.11-py3:rockylinux-9
- name: rockylinux-8-3006-11
driver:
image: saltimages/salt-3006.11-py3:rockylinux-8
##########################################################
# This file is managed as part of a Copier template. #
# Please make your own changes below this comment. #
##########################################################
verifier:
# https://www.inspec.io/

64
salt/osfamilymap.yaml
View File

@ -2,26 +2,29 @@
# vim: ft=yaml
---
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
# {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
# yamllint disable rule:line-length
# {%- set osrelease = salt['grains.get']('osrelease', '') %}
# {%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
# {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
# {%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
# yamllint enable rule:line-length
{%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
{%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
#from template-formula
{%- if grains.os_family == 'MacOS' %}
{%- set rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %}
{%- set rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
{%- elif grains.os_family == 'Windows' %}
{%- set rootuser = salt['cmd.run']("whoami").split("\\")[1] %}
{%- endif %}
# From `template-formula`
# {%- if grains.os_family == 'MacOS' %}
# {%- set rootuser = salt['cmd.run']("stat -f '%Su' /dev/console") %}
# {%- set rootgroup = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
# {%- elif grains.os_family == 'Windows' %}
# {%- set rootuser = salt['cmd.run']("whoami").split("\\")[1] %}
# {%- endif %}
Debian:
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64] {{ salt_repo }}/saltproject-deb stable main'
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64]
{{ salt_repo }}/saltproject-deb stable main'
pkgrepo_keyring: '{{ salt_repo_key_url }}'
pkgrepo_keyring_hash: sha256=36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
pkgrepo_keyring_hash:
sha256=36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
libgit2: libgit2-22
pyinotify: python-pyinotify
gitfs:
@ -53,9 +56,12 @@ RedHat:
gitfs_provider: pygit2
Suse:
pkgrepo_humanname: 'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
pkgrepo: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/'
key_url: 'https://download.opensuse.org/repositories/systemsmanagement:/saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key'
pkgrepo_humanname:
'Salt releases for SLE-based SUSE products (openSUSE_{{ opensuse_repo_suffix }})'
pkgrepo: "https://download.opensuse.org/repositories/systemsmanagement:\
/saltstack/openSUSE_{{ opensuse_repo_suffix }}/"
key_url: "https://download.opensuse.org/repositories/systemsmanagement:\
/saltstack/openSUSE_{{ opensuse_repo_suffix }}/repodata/repomd.xml.key"
pygit2: python-pygit2
pyinotify: python-pyinotify
gitfs:
@ -99,14 +105,14 @@ Alpine:
FreeBSD:
rootgroup: wheel
salt_master: {{ py_ver_repr or 'py27' }}-salt
salt_minion: {{ py_ver_repr or 'py27' }}-salt
salt_syndic: {{ py_ver_repr or 'py27' }}-salt
salt_cloud: {{ py_ver_repr or 'py27' }}-salt
salt_api: {{ py_ver_repr or 'py27' }}-salt
salt_ssh: {{ py_ver_repr or 'py27' }}-salt
python_git: {{ py_ver_repr or 'py27' }}-GitPython
pygit2: {{ py_ver_repr or 'py27' }}-pygit2
salt_master: '{{ py_ver_repr or "py27" }}-salt'
salt_minion: '{{ py_ver_repr or "py27" }}-salt'
salt_syndic: '{{ py_ver_repr or "py27" }}-salt'
salt_cloud: '{{ py_ver_repr or "py27" }}-salt'
salt_api: '{{ py_ver_repr or "py27" }}-salt'
salt_ssh: '{{ py_ver_repr or "py27" }}-salt'
python_git: '{{ py_ver_repr or "py27" }}-GitPython'
pygit2: '{{ py_ver_repr or "py27" }}-pygit2'
config_path: /usr/local/etc/salt
minion_service: salt_minion
master_service: salt_master
@ -129,7 +135,7 @@ Windows:
salt_minion: salt-minion{{ '-' ~ py_ver_repr if py_ver_repr else '' }}
config_path: 'C:\salt\conf'
minion_service: salt-minion
rootuser: {{ rootuser | d('') }}
rootuser: '{{ rootuser | d("") }}'
MacOS:
salt_master: saltstack
@ -139,5 +145,5 @@ MacOS:
config_path: /private/etc/salt
minion_service: com.saltstack.salt.minion
## from template-formula
rootuser: {{ rootuser | d('') }}
rootgroup: {{ rootgroup | d('') }}
rootuser: '{{ rootuser | d("") }}'
rootgroup: '{{ rootgroup | d("") }}'

10
salt/osfingermap.yaml
View File

@ -2,10 +2,12 @@
# vim: ft=yaml
---
{%- set osrelease = salt['grains.get']('osrelease', '') %}
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
{%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
# yamllint disable rule:line-length
# {%- set osrelease = salt['grains.get']('osrelease', '') %}
# {%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
# {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
# {%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
# yamllint enable rule:line-length
Oracle Linux Server-7:
pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }}

26
salt/osmap.yaml
View File

@ -2,10 +2,11 @@
# vim: ft=yaml
---
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
{%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
# {%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
# yamllint disable rule:line-length
# {%- set salt_repo = salt['pillar.get']('salt:repo', 'https://packages.broadcom.com/artifactory') %}
# {%- set salt_repo_key_url = salt['pillar.get']('salt:repo_key_url', salt_repo ~ '/api/security/keypair/SaltProjectKey/public') %}
# yamllint enable rule:line-length
Fedora:
pygit2: python2-pygit2
@ -17,9 +18,11 @@ Amazon:
key_url: '{{ salt_repo_key_url }}'
Ubuntu:
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64] {{ salt_repo }}/saltproject-deb stable main'
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=amd64]
{{ salt_repo }}/saltproject-deb stable main'
pkgrepo_keyring: '{{ salt_repo_key_url }}'
pkgrepo_keyring_hash: sha256=36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
pkgrepo_keyring_hash:
sha256=36decef986477acb8ba2a1fc4041bcf9f22229ef6c939d0317c9e36a9d142b34
key_url: '{{ salt_repo_key_url }}'
pygit2: python-pygit2
gitfs:
@ -30,7 +33,8 @@ Ubuntu:
install_from_package: Null
Raspbian:
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=armhf] {{ salt_repo }}/saltproject-deb stable main'
pkgrepo: 'deb [signed-by=/etc/apt/keyrings/salt-archive-keyring.pgp arch=armhf]
{{ salt_repo }}/saltproject-deb stable main'
pkgrepo_keyring: '{{ salt_repo_key_url }}'
SmartOS:
@ -43,7 +47,7 @@ SmartOS:
minion_service: 'salt:minion'
master_service: 'salt:master'
api_service: 'salt:api'
python_dulwich: {{ py_ver_repr or 'py27' }}{{ '-dulwich' }}
python_dulwich: '{{ py_ver_repr or "py27" }}{{ "-dulwich" }}'
gitfs:
dulwich:
install_from_source: false
@ -54,8 +58,10 @@ SmartOS:
MacOS:
minion_service: com.saltstack.salt.minion
master_service: com.saltstack.salt.master
salt_master_macos_plist_hash: 8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
salt_master_macos_plist_hash:
8435331b2d48ca8f0759f216e5b15ec9171a4216b1441328c732c6906728b7c9
salt_minion_macos_plist_hash:
26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
FreeBSD:
salt_master: py39-salt