mirror of
https://github.com/saltstack-formulas/salt-formula.git
synced 2025-04-17 10:10:29 +00:00
Compare commits
43 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
bf52207a9b | ||
|
|
d79c22d313 | ||
|
|
570c44b166 | ||
|
|
ad0980897b | ||
|
|
8ded2cecdc | ||
|
|
be66375cb7 | ||
|
|
1ca9120974 | ||
|
|
037b529a34 | ||
|
|
e121b49942 | ||
|
|
f26b03cb78 | ||
|
|
2a7a9decee | ||
|
|
2bb9d422bd | ||
|
|
cc6a3a204e | ||
|
|
fe660a9f9b | ||
|
|
2881fdd811 | ||
|
|
a81ced482d | ||
|
|
7772142051 | ||
|
|
b593a5b862 | ||
|
|
c8f9dd44e6 | ||
|
|
35b9d549df | ||
|
|
1741c8d4e2 | ||
|
|
b7d15c9dd0 | ||
|
|
b62986613b | ||
|
|
0175f54f08 | ||
|
|
c05fddf139 | ||
|
|
c1c635fda4 | ||
|
|
dc9cff99c5 | ||
|
|
b2316ed17b | ||
|
|
3eff2d2acf | ||
|
|
8ab60b9689 | ||
|
|
e8a1237632 | ||
|
|
18a6230856 | ||
|
|
124478c3ce | ||
|
|
552ce72d7d | ||
|
|
24b2ff65e9 | ||
|
|
88b18c744c | ||
|
|
1ab177d5be | ||
|
|
8f0c7ac161 | ||
|
|
0e4b3bdf94 | ||
|
|
fa3b201773 | ||
|
|
c20deb92d4 | ||
|
|
37dd068d19 | ||
|
|
1ea1cf5d7a |
42 changed files with 1183 additions and 486 deletions
79
.github/workflows/kitchen.macos.yml
vendored
Normal file
79
.github/workflows/kitchen.macos.yml
vendored
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# -*- 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 }}'
|
||||
1
.github/workflows/kitchen.vagrant.yml
vendored
1
.github/workflows/kitchen.vagrant.yml
vendored
|
|
@ -19,7 +19,6 @@ jobs:
|
|||
- default-freebsd-130-3004-0-py3
|
||||
- default-freebsd-123-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:
|
||||
|
|
|
|||
|
|
@ -14,10 +14,8 @@
|
|||
stage_test: &stage_test 'test'
|
||||
# `image`
|
||||
image_commitlint: &image_commitlint 'myii/ssf-commitlint:11'
|
||||
image_dindruby: &image_dindruby 'myii/ssf-dind-ruby:2.7.1-r3'
|
||||
image_precommit: &image_precommit
|
||||
name: 'myii/ssf-pre-commit:2.9.2'
|
||||
entrypoint: ['/bin/bash', '-c']
|
||||
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'
|
||||
# `services`
|
||||
|
|
@ -134,6 +132,7 @@ rubocop:
|
|||
# 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'}
|
||||
|
|
@ -146,12 +145,13 @@ 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-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-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'}
|
||||
|
|
@ -165,12 +165,13 @@ rubocop:
|
|||
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-fedora-34-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'}
|
||||
|
|
@ -182,7 +183,7 @@ 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-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'}
|
||||
|
|
@ -191,14 +192,6 @@ default-centos-7-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'}
|
||||
# default-debian-10-3002-8-py3: {extends: '.test_instance'}
|
||||
default-debian-9-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-2004-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-ubuntu-1804-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-centos-7-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-amazonlinux-2-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-8-3002-8-py3: {extends: '.test_instance'}
|
||||
# default-oraclelinux-7-3002-8-py3: {extends: '.test_instance'}
|
||||
# yamllint enable rule:line-length
|
||||
|
||||
###############################################################################
|
||||
|
|
|
|||
|
|
@ -3,6 +3,18 @@
|
|||
---
|
||||
# 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
|
||||
|
|
@ -12,13 +24,9 @@ repos:
|
|||
name: Check commit message using commitlint
|
||||
description: Lint commit message against @commitlint/config-conventional rules
|
||||
stages: [commit-msg]
|
||||
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
|
||||
- id: commitlint-travis
|
||||
stages: [manual]
|
||||
additional_dependencies: ['@commitlint/config-conventional@8.3.4']
|
||||
always_run: true
|
||||
additional_dependencies: ['@commitlint/config-conventional@17.1.0']
|
||||
- repo: https://github.com/rubocop-hq/rubocop
|
||||
rev: v1.25.1
|
||||
rev: v1.57.0
|
||||
hooks:
|
||||
- id: rubocop
|
||||
name: Check Ruby files with rubocop
|
||||
|
|
@ -26,32 +34,57 @@ repos:
|
|||
always_run: true
|
||||
pass_filenames: false
|
||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||
rev: v0.8.0.4
|
||||
rev: v0.9.0.6
|
||||
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.32.0
|
||||
hooks:
|
||||
- id: yamllint
|
||||
name: Check YAML syntax with yamllint
|
||||
args: [--strict, '.']
|
||||
always_run: true
|
||||
pass_filenames: false
|
||||
args: [--strict]
|
||||
types: [file]
|
||||
# Files to include
|
||||
# 1. Obvious YAML files
|
||||
# 2. `pillar.example` and similar files
|
||||
# 3. SLS files under directory `test/` which are pillar files
|
||||
# Files to exclude
|
||||
# 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
|
||||
files: |
|
||||
(?x)^(
|
||||
.*\.yaml|
|
||||
.*\.yml|
|
||||
\.salt-lint|
|
||||
\.yamllint|
|
||||
.*\.example|
|
||||
test/.*\.sls
|
||||
)$
|
||||
exclude: |
|
||||
(?x)^(
|
||||
kitchen.vagrant.yml|
|
||||
test/.*/states/.*\.sls|
|
||||
salt/osfamilymap.yaml|
|
||||
salt/osmap.yaml|
|
||||
salt/osfingermap.yaml
|
||||
)$
|
||||
- repo: https://github.com/warpnet/salt-lint
|
||||
rev: v0.8.0
|
||||
rev: v0.9.2
|
||||
hooks:
|
||||
- id: salt-lint
|
||||
name: Check Salt files using salt-lint
|
||||
files: ^.*\.(sls|jinja|j2|tmpl|tst)$
|
||||
- repo: https://github.com/myint/rstcheck
|
||||
rev: 3f929574
|
||||
rev: v6.2.0
|
||||
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
|
||||
hooks:
|
||||
|
|
@ -62,4 +95,4 @@ repos:
|
|||
docs/CHANGELOG.rst|
|
||||
docs/TOFS_pattern.rst|
|
||||
)$
|
||||
additional_dependencies: [pygments==2.9.0]
|
||||
additional_dependencies: [pygments==2.16.1]
|
||||
|
|
|
|||
17
.travis.yml
17
.travis.yml
|
|
@ -86,6 +86,7 @@ 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
|
||||
|
|
@ -98,12 +99,13 @@ 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-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-opensuse-leap-153-master-py3
|
||||
# - env: INSTANCE=default-opensuse-tmbl-latest-master-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-master-py3
|
||||
|
|
@ -117,12 +119,13 @@ jobs:
|
|||
- 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-fedora-34-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
|
||||
|
|
@ -134,7 +137,7 @@ jobs:
|
|||
- 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-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
|
||||
|
|
@ -143,14 +146,6 @@ jobs:
|
|||
# - 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-10-3002-8-py3
|
||||
- env: INSTANCE=default-debian-9-3002-8-py3
|
||||
# - env: INSTANCE=default-ubuntu-2004-3002-8-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-3002-8-py3
|
||||
# - env: INSTANCE=default-centos-7-3002-8-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-3002-8-py3
|
||||
# - env: INSTANCE=default-oraclelinux-8-3002-8-py3
|
||||
# - env: INSTANCE=default-oraclelinux-7-3002-8-py3
|
||||
|
||||
## Define the release stage that runs `semantic-release`
|
||||
- stage: 'release'
|
||||
|
|
|
|||
31
.yamllint
31
.yamllint
|
|
@ -4,37 +4,6 @@
|
|||
# Extend the `default` configuration provided by `yamllint`
|
||||
extends: 'default'
|
||||
|
||||
# Files to ignore completely
|
||||
# 1. All YAML files under directory `.bundle/`, introduced if gems are installed locally
|
||||
# 2. All YAML files under directory `.cache/`, introduced during the CI run
|
||||
# 3. All YAML files under directory `.git/`
|
||||
# 4. All YAML files under directory `node_modules/`, introduced during the CI run
|
||||
# 5. Any SLS files under directory `test/`, which are actually state files
|
||||
# 6. Any YAML files under directory `.kitchen/`, introduced during local testing
|
||||
# 7. `kitchen.vagrant.yml`, which contains Embedded Ruby (ERB) template syntax
|
||||
# 8. All YAML files heavily reliant on Jinja; these can be tackled in a subsequent PR
|
||||
ignore: |
|
||||
.bundle/
|
||||
.cache/
|
||||
.git/
|
||||
node_modules/
|
||||
test/**/states/**/*.sls
|
||||
.kitchen/
|
||||
kitchen.vagrant.yml
|
||||
salt/osfamilymap.yaml
|
||||
salt/osmap.yaml
|
||||
salt/osfingermap.yaml
|
||||
|
||||
yaml-files:
|
||||
# Default settings
|
||||
- '*.yaml'
|
||||
- '*.yml'
|
||||
- .salt-lint
|
||||
- .yamllint
|
||||
# SaltStack Formulas additional settings
|
||||
- '*.example'
|
||||
- test/**/*.sls
|
||||
|
||||
rules:
|
||||
empty-values:
|
||||
forbid-in-block-mappings: true
|
||||
|
|
|
|||
12
AUTHORS.md
12
AUTHORS.md
|
|
@ -4,8 +4,8 @@ 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)|274
|
||||
<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/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/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
|
||||
|
|
@ -17,7 +17,7 @@ Avatar|Contributor|Contributions
|
|||
<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/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='@babilen'>|[@babilen](https://github.com/babilen)|8
|
||||
<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/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
|
||||
|
|
@ -37,7 +37,6 @@ Avatar|Contributor|Contributions
|
|||
<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
|
||||
|
|
@ -62,6 +61,7 @@ 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/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
|
||||
|
|
@ -76,6 +76,7 @@ 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
|
||||
|
|
@ -109,9 +110,8 @@ 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-04-03.
|
||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2022-08-26.
|
||||
|
|
|
|||
59
CHANGELOG.md
59
CHANGELOG.md
|
|
@ -1,5 +1,64 @@
|
|||
# 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)
|
||||
|
||||
|
||||
|
|
|
|||
2
FORMULA
2
FORMULA
|
|
@ -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.10.2
|
||||
version: 1.12.0
|
||||
release: 1
|
||||
minimum_version: 2015.8
|
||||
summary: Formula for install Saltstack
|
||||
|
|
|
|||
5
Gemfile
5
Gemfile
|
|
@ -1,6 +1,6 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
source ENV['PROXY_RUBYGEMSORG'] || 'https://rubygems.org'
|
||||
source ENV.fetch('PROXY_RUBYGEMSORG', '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.
|
||||
|
|
@ -18,6 +18,9 @@ gem 'kitchen-docker', git: 'https://gitlab.com/saltstack-formulas/infrastructure
|
|||
gem 'kitchen-inspec', '>= 2.5.0'
|
||||
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
|
||||
|
|
|
|||
467
Gemfile.lock
467
Gemfile.lock
|
|
@ -1,24 +1,26 @@
|
|||
GIT
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/inspec
|
||||
revision: 36118e817641fbc1d4bd9753a77c383e7b20caff
|
||||
revision: a0c6295303f7d7a4d2a6164b5e77868560b04945
|
||||
branch: ssf
|
||||
specs:
|
||||
inspec (5.10.7)
|
||||
inspec (5.21.15)
|
||||
cookstyle
|
||||
faraday_middleware (>= 0.12.2, < 1.1)
|
||||
inspec-core (= 5.10.7)
|
||||
inspec-core (= 5.21.15)
|
||||
mongo (= 2.13.2)
|
||||
progress_bar (~> 1.3.3)
|
||||
rake
|
||||
train (~> 3.0)
|
||||
roo (~> 2.9.0)
|
||||
roo-xls
|
||||
train (~> 3.10)
|
||||
train-aws (~> 0.2)
|
||||
train-habitat (~> 0.1)
|
||||
train-winrm (~> 0.2)
|
||||
inspec-core (5.10.7)
|
||||
inspec-core (5.21.15)
|
||||
addressable (~> 2.4)
|
||||
chef-telemetry (~> 1.0, >= 1.0.8)
|
||||
faraday (>= 0.9.0, < 1.5)
|
||||
faraday_middleware (~> 1.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-follow_redirects (~> 0.3)
|
||||
hashie (>= 3.4, < 5.0)
|
||||
license-acceptance (>= 0.2.13, < 3.0)
|
||||
method_source (>= 0.8, < 2.0)
|
||||
|
|
@ -34,219 +36,227 @@ GIT
|
|||
sslshake (~> 1.2)
|
||||
thor (>= 0.20, < 2.0)
|
||||
tomlrb (>= 1.2, < 2.1)
|
||||
train-core (~> 3.0)
|
||||
train-core (~> 3.10)
|
||||
tty-prompt (~> 0.17)
|
||||
tty-table (~> 0.10)
|
||||
|
||||
GIT
|
||||
remote: https://gitlab.com/saltstack-formulas/infrastructure/kitchen-docker
|
||||
revision: 4e03ca42d98624323c1c2d91ceb39c09a29bbfc8
|
||||
revision: 104079a1d2fe34f5b076f4d316f6f837fa76e412
|
||||
branch: ssf
|
||||
specs:
|
||||
kitchen-docker (2.12.0)
|
||||
kitchen-docker (2.13.0)
|
||||
test-kitchen (>= 1.0.0)
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (7.0.2.3)
|
||||
activesupport (7.1.1)
|
||||
base64
|
||||
bigdecimal
|
||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||
connection_pool (>= 2.2.5)
|
||||
drb
|
||||
i18n (>= 1.6, < 2)
|
||||
minitest (>= 5.1)
|
||||
mutex_m
|
||||
tzinfo (~> 2.0)
|
||||
addressable (2.8.0)
|
||||
public_suffix (>= 2.0.2, < 5.0)
|
||||
addressable (2.8.5)
|
||||
public_suffix (>= 2.0.2, < 6.0)
|
||||
ast (2.4.2)
|
||||
aws-eventstream (1.2.0)
|
||||
aws-partitions (1.571.0)
|
||||
aws-sdk-alexaforbusiness (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-partitions (1.841.0)
|
||||
aws-sdk-account (1.18.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-alexaforbusiness (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.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.75.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-apigateway (1.88.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-apigatewayv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-apigatewayv2 (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.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.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-athena (1.75.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-autoscaling (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-autoscaling (1.92.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-batch (1.47.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-batch (1.73.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-budgets (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-budgets (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudformation (1.68.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudformation (1.91.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudfront (1.63.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudfront (1.83.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsm (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudhsm (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudhsmv2 (1.42.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudhsmv2 (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudtrail (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudtrail (1.69.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatch (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudwatch (1.81.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatchevents (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-cloudwatchevents (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cloudwatchlogs (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-cloudwatchlogs (1.71.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codecommit (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codecommit (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codedeploy (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codedeploy (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-codepipeline (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-codepipeline (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cognitoidentity (1.31.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-cognitoidentity (1.45.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-cognitoidentityprovider (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-cognitoidentityprovider (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-configservice (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-configservice (1.99.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-core (3.130.0)
|
||||
aws-sdk-core (3.185.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
aws-partitions (~> 1, >= 1.525.0)
|
||||
aws-partitions (~> 1, >= 1.651.0)
|
||||
aws-sigv4 (~> 1.5)
|
||||
jmespath (~> 1, >= 1.6.1)
|
||||
aws-sdk-costandusagereportservice (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
jmespath (~> 1.0)
|
||||
aws-sdk-costandusagereportservice (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-databasemigrationservice (1.80.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-databasemigrationservice (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-dynamodb (1.96.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-dynamodb (1.74.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ec2 (1.415.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ec2 (1.304.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecr (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecr (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecrpublic (1.23.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecrpublic (1.12.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ecs (1.131.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ecs (1.99.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-efs (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-efs (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-eks (1.91.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-eks (1.74.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticache (1.92.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticache (1.76.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticbeanstalk (1.61.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticbeanstalk (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticloadbalancing (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancing (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticloadbalancingv2 (1.93.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticloadbalancingv2 (1.77.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-elasticsearchservice (1.65.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-elasticsearchservice (1.77.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-emr (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.121.2)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-eventbridge (1.24.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-eventbridge (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-firehose (1.48.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-firehose (1.58.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-glue (1.88.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-glue (1.145.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-guardduty (1.56.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-guardduty (1.81.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-iam (1.68.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-iam (1.89.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kafka (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kafka (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kinesis (1.41.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kinesis (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-kms (1.55.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-kms (1.72.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-lambda (1.82.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-lambda (1.106.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.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.15.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-networkfirewall (1.35.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-networkmanager (1.22.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-networkmanager (1.38.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-organizations (1.59.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-organizations (1.77.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ram (1.26.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-rds (1.142.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-rds (1.198.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-redshift (1.80.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-redshift (1.99.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53 (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53 (1.80.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53domains (1.40.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53domains (1.52.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-route53resolver (1.37.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-route53resolver (1.49.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-s3 (1.113.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-s3 (1.136.0)
|
||||
aws-sdk-core (~> 3, >= 3.181.0)
|
||||
aws-sdk-kms (~> 1)
|
||||
aws-sigv4 (~> 1.4)
|
||||
aws-sigv4 (~> 1.6)
|
||||
aws-sdk-s3control (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-secretsmanager (1.46.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-securityhub (1.62.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-securityhub (1.94.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-servicecatalog (1.60.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
|
|
@ -254,8 +264,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.58.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-signer (1.32.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
|
|
@ -263,17 +273,17 @@ GEM
|
|||
aws-sdk-simpledb (1.29.0)
|
||||
aws-sdk-core (~> 3, >= 3.120.0)
|
||||
aws-sigv2 (~> 1.0)
|
||||
aws-sdk-sms (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-sms (1.50.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sns (1.53.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-sns (1.67.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-sqs (1.51.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-sqs (1.64.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-ssm (1.134.0)
|
||||
aws-sdk-core (~> 3, >= 3.127.0)
|
||||
aws-sdk-ssm (1.159.0)
|
||||
aws-sdk-core (~> 3, >= 3.184.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-states (1.39.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
|
|
@ -281,14 +291,14 @@ GEM
|
|||
aws-sdk-synthetics (1.19.0)
|
||||
aws-sdk-core (~> 3, >= 3.121.2)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-transfer (1.34.0)
|
||||
aws-sdk-core (~> 3, >= 3.112.0)
|
||||
aws-sdk-transfer (1.73.0)
|
||||
aws-sdk-core (~> 3, >= 3.176.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sdk-waf (1.43.0)
|
||||
aws-sdk-core (~> 3, >= 3.122.0)
|
||||
aws-sigv4 (~> 1.1)
|
||||
aws-sigv2 (1.1.0)
|
||||
aws-sigv4 (1.4.0)
|
||||
aws-sigv4 (1.6.1)
|
||||
aws-eventstream (~> 1, >= 1.0.2)
|
||||
azure_graph_rbac (0.17.2)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
|
|
@ -300,12 +310,14 @@ GEM
|
|||
ms_rest_azure (~> 0.12.0)
|
||||
azure_mgmt_storage (0.23.0)
|
||||
ms_rest_azure (~> 0.12.0)
|
||||
base64 (0.1.1)
|
||||
bcrypt_pbkdf (1.1.0)
|
||||
bson (4.14.1)
|
||||
bigdecimal (3.1.4)
|
||||
bson (4.15.0)
|
||||
builder (3.2.4)
|
||||
chef-config (17.10.0)
|
||||
chef-config (18.3.0)
|
||||
addressable
|
||||
chef-utils (= 17.10.0)
|
||||
chef-utils (= 18.3.0)
|
||||
fuzzyurl
|
||||
mixlib-config (>= 2.2.12, < 4.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
|
|
@ -313,11 +325,12 @@ GEM
|
|||
chef-telemetry (1.1.1)
|
||||
chef-config
|
||||
concurrent-ruby (~> 1.0)
|
||||
chef-utils (17.10.0)
|
||||
chef-utils (18.3.0)
|
||||
concurrent-ruby
|
||||
coderay (1.1.3)
|
||||
concurrent-ruby (1.1.10)
|
||||
cookstyle (7.32.1)
|
||||
concurrent-ruby (1.2.2)
|
||||
connection_pool (2.4.1)
|
||||
cookstyle (7.32.2)
|
||||
rubocop (= 1.25.1)
|
||||
declarative (0.0.20)
|
||||
diff-lcs (1.5.0)
|
||||
|
|
@ -326,16 +339,22 @@ GEM
|
|||
multi_json
|
||||
domain_name (0.5.20190701)
|
||||
unf (>= 0.0.5, < 1.0.0)
|
||||
drb (2.1.1)
|
||||
ruby2_keywords
|
||||
ed25519 (1.3.0)
|
||||
erubi (1.10.0)
|
||||
excon (0.92.1)
|
||||
faraday (1.4.3)
|
||||
erubi (1.12.0)
|
||||
excon (0.104.0)
|
||||
faraday (1.10.3)
|
||||
faraday-em_http (~> 1.0)
|
||||
faraday-em_synchrony (~> 1.0)
|
||||
faraday-excon (~> 1.1)
|
||||
faraday-httpclient (~> 1.0)
|
||||
faraday-multipart (~> 1.0)
|
||||
faraday-net_http (~> 1.0)
|
||||
faraday-net_http_persistent (~> 1.1)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faraday-net_http_persistent (~> 1.0)
|
||||
faraday-patron (~> 1.0)
|
||||
faraday-rack (~> 1.0)
|
||||
faraday-retry (~> 1.0)
|
||||
ruby2_keywords (>= 0.0.4)
|
||||
faraday-cookie_jar (0.0.7)
|
||||
faraday (>= 0.8.0)
|
||||
|
|
@ -343,11 +362,19 @@ GEM
|
|||
faraday-em_http (1.0.0)
|
||||
faraday-em_synchrony (1.0.0)
|
||||
faraday-excon (1.1.0)
|
||||
faraday-follow_redirects (0.3.0)
|
||||
faraday (>= 1, < 3)
|
||||
faraday-httpclient (1.0.1)
|
||||
faraday-multipart (1.0.4)
|
||||
multipart-post (~> 2)
|
||||
faraday-net_http (1.0.1)
|
||||
faraday-net_http_persistent (1.2.0)
|
||||
faraday-patron (1.0.0)
|
||||
faraday-rack (1.0.0)
|
||||
faraday-retry (1.0.3)
|
||||
faraday_middleware (1.0.0)
|
||||
faraday (~> 1.0)
|
||||
ffi (1.15.5)
|
||||
ffi (1.16.3)
|
||||
fuzzyurl (0.9.0)
|
||||
google-api-client (0.52.0)
|
||||
addressable (~> 2.5, >= 2.5.1)
|
||||
|
|
@ -367,27 +394,28 @@ GEM
|
|||
signet (~> 0.14)
|
||||
gssapi (1.3.1)
|
||||
ffi (>= 1.0.1)
|
||||
gyoku (1.3.1)
|
||||
gyoku (1.4.0)
|
||||
builder (>= 2.1.2)
|
||||
rexml (~> 3.0)
|
||||
hashie (4.1.0)
|
||||
highline (2.0.3)
|
||||
http-cookie (1.0.4)
|
||||
highline (2.1.0)
|
||||
http-cookie (1.0.5)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
i18n (1.10.0)
|
||||
i18n (1.14.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
inifile (3.0.0)
|
||||
jmespath (1.6.1)
|
||||
json (2.6.1)
|
||||
jwt (2.3.0)
|
||||
kitchen-inspec (2.5.2)
|
||||
jmespath (1.6.2)
|
||||
json (2.6.3)
|
||||
jwt (2.7.1)
|
||||
kitchen-inspec (2.6.2)
|
||||
hashie (>= 3.4, <= 5.0)
|
||||
inspec (>= 2.2.64, < 6.0)
|
||||
test-kitchen (>= 2.7, < 4)
|
||||
kitchen-salt (0.7.2)
|
||||
hashie (>= 3.5)
|
||||
test-kitchen (>= 1.4)
|
||||
kitchen-vagrant (1.11.0)
|
||||
kitchen-vagrant (1.14.1)
|
||||
test-kitchen (>= 1.4, < 4)
|
||||
license-acceptance (2.1.13)
|
||||
pastel (~> 0.7)
|
||||
|
|
@ -395,21 +423,22 @@ GEM
|
|||
tty-box (~> 0.6)
|
||||
tty-prompt (~> 0.20)
|
||||
little-plugger (1.1.4)
|
||||
logging (2.3.0)
|
||||
logging (2.3.1)
|
||||
little-plugger (~> 1.1)
|
||||
multi_json (~> 1.14)
|
||||
memoist (0.16.2)
|
||||
method_source (1.0.0)
|
||||
mini_mime (1.1.2)
|
||||
minitest (5.15.0)
|
||||
mixlib-config (3.0.9)
|
||||
mini_mime (1.1.5)
|
||||
mini_portile2 (2.8.5)
|
||||
minitest (5.20.0)
|
||||
mixlib-config (3.0.27)
|
||||
tomlrb
|
||||
mixlib-install (3.12.16)
|
||||
mixlib-install (3.12.28)
|
||||
mixlib-shellout
|
||||
mixlib-versioning
|
||||
thor
|
||||
mixlib-log (3.0.9)
|
||||
mixlib-shellout (3.2.5)
|
||||
mixlib-shellout (3.2.7)
|
||||
chef-utils
|
||||
mixlib-versioning (1.2.12)
|
||||
mongo (2.13.2)
|
||||
|
|
@ -424,53 +453,66 @@ GEM
|
|||
faraday-cookie_jar (~> 0.0.6)
|
||||
ms_rest (~> 0.7.6)
|
||||
multi_json (1.15.0)
|
||||
multipart-post (2.1.1)
|
||||
net-scp (3.0.0)
|
||||
net-ssh (>= 2.6.5, < 7.0.0)
|
||||
net-ssh (6.1.0)
|
||||
multipart-post (2.3.0)
|
||||
mutex_m (0.1.2)
|
||||
net-scp (4.0.0)
|
||||
net-ssh (>= 2.6.5, < 8.0.0)
|
||||
net-ssh (7.2.0)
|
||||
net-ssh-gateway (2.0.0)
|
||||
net-ssh (>= 4.0.0)
|
||||
nokogiri (1.15.4)
|
||||
mini_portile2 (~> 2.8.2)
|
||||
racc (~> 1.4)
|
||||
nori (2.6.0)
|
||||
options (2.3.2)
|
||||
os (1.1.4)
|
||||
parallel (1.22.1)
|
||||
parser (3.1.1.0)
|
||||
parallel (1.23.0)
|
||||
parser (3.2.2.4)
|
||||
ast (~> 2.4.1)
|
||||
racc
|
||||
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)
|
||||
pry (0.14.2)
|
||||
coderay (~> 1.1)
|
||||
method_source (~> 1.0)
|
||||
public_suffix (4.0.6)
|
||||
public_suffix (5.0.3)
|
||||
racc (1.7.1)
|
||||
rainbow (3.1.1)
|
||||
rake (13.0.6)
|
||||
regexp_parser (2.2.1)
|
||||
representable (3.1.1)
|
||||
regexp_parser (2.8.2)
|
||||
representable (3.2.0)
|
||||
declarative (< 0.1.0)
|
||||
trailblazer-option (>= 0.1.1, < 0.2.0)
|
||||
uber (< 0.2.0)
|
||||
retriable (3.1.2)
|
||||
rexml (3.2.5)
|
||||
rexml (3.2.6)
|
||||
roo (2.9.0)
|
||||
nokogiri (~> 1)
|
||||
rubyzip (>= 1.3.0, < 3.0.0)
|
||||
roo-xls (1.2.0)
|
||||
nokogiri
|
||||
roo (>= 2.0.0, < 3)
|
||||
spreadsheet (> 0.9.0)
|
||||
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-expectations (3.11.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.11.0)
|
||||
rspec-its (1.3.0)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.11.0)
|
||||
rspec-mocks (3.11.2)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.11.0)
|
||||
rspec-support (3.11.0)
|
||||
rspec-support (3.11.1)
|
||||
rubocop (1.25.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 3.1.0.0)
|
||||
|
|
@ -480,43 +522,46 @@ GEM
|
|||
rubocop-ast (>= 1.15.1, < 2.0)
|
||||
ruby-progressbar (~> 1.7)
|
||||
unicode-display_width (>= 1.4.0, < 3.0)
|
||||
rubocop-ast (1.16.0)
|
||||
parser (>= 3.1.1.0)
|
||||
ruby-progressbar (1.11.0)
|
||||
rubocop-ast (1.30.0)
|
||||
parser (>= 3.2.1.0)
|
||||
ruby-ole (1.2.12.2)
|
||||
ruby-progressbar (1.13.0)
|
||||
ruby2_keywords (0.0.5)
|
||||
rubyntlm (0.6.3)
|
||||
rubyzip (2.3.2)
|
||||
semverse (3.0.0)
|
||||
signet (0.16.1)
|
||||
semverse (3.0.2)
|
||||
signet (0.18.0)
|
||||
addressable (~> 2.8)
|
||||
faraday (>= 0.17.5, < 3.0)
|
||||
faraday (>= 0.17.5, < 3.a)
|
||||
jwt (>= 1.5, < 3.0)
|
||||
multi_json (~> 1.10)
|
||||
spreadsheet (1.3.0)
|
||||
ruby-ole
|
||||
sslshake (1.3.1)
|
||||
strings (0.2.1)
|
||||
strings-ansi (~> 0.2)
|
||||
unicode-display_width (>= 1.5, < 3.0)
|
||||
unicode_utils (~> 1.4)
|
||||
strings-ansi (0.2.0)
|
||||
test-kitchen (3.2.2)
|
||||
test-kitchen (3.5.0)
|
||||
bcrypt_pbkdf (~> 1.0)
|
||||
chef-utils (>= 16.4.35)
|
||||
ed25519 (~> 1.2)
|
||||
license-acceptance (>= 1.0.11, < 3.0)
|
||||
mixlib-install (~> 3.6)
|
||||
mixlib-shellout (>= 1.2, < 4.0)
|
||||
net-scp (>= 1.1, < 4.0)
|
||||
net-ssh (>= 2.9, < 7.0)
|
||||
net-scp (>= 1.1, < 5.0)
|
||||
net-ssh (>= 2.9, < 8.0)
|
||||
net-ssh-gateway (>= 1.2, < 3.0)
|
||||
thor (>= 0.19, < 2.0)
|
||||
winrm (~> 2.0)
|
||||
winrm-elevated (~> 1.0)
|
||||
winrm-fs (~> 1.1)
|
||||
thor (1.2.1)
|
||||
thor (1.3.0)
|
||||
timeliness (0.3.10)
|
||||
tomlrb (1.3.0)
|
||||
trailblazer-option (0.1.2)
|
||||
train (3.8.9)
|
||||
train (3.10.8)
|
||||
activesupport (>= 6.0.3.1)
|
||||
azure_graph_rbac (~> 0.16)
|
||||
azure_mgmt_key_vault (~> 0.17)
|
||||
|
|
@ -527,17 +572,18 @@ GEM
|
|||
google-api-client (>= 0.23.9, <= 0.52.0)
|
||||
googleauth (>= 0.6.6, <= 0.14.0)
|
||||
inifile (~> 3.0)
|
||||
train-core (= 3.8.9)
|
||||
train-core (= 3.10.8)
|
||||
train-winrm (~> 0.2)
|
||||
train-aws (0.2.24)
|
||||
train-aws (0.2.36)
|
||||
aws-sdk-account (~> 1.14)
|
||||
aws-sdk-alexaforbusiness (~> 1.0)
|
||||
aws-sdk-amplify (~> 1.32.0)
|
||||
aws-sdk-apigateway (~> 1.0)
|
||||
aws-sdk-apigatewayv2 (~> 1.0)
|
||||
aws-sdk-applicationautoscaling (>= 1.46, < 1.52)
|
||||
aws-sdk-athena (~> 1.0)
|
||||
aws-sdk-autoscaling (>= 1.22, < 1.64)
|
||||
aws-sdk-batch (>= 1.36, < 1.48)
|
||||
aws-sdk-autoscaling (>= 1.22, < 1.93)
|
||||
aws-sdk-batch (>= 1.36, < 1.74)
|
||||
aws-sdk-budgets (~> 1.0)
|
||||
aws-sdk-cloudformation (~> 1.0)
|
||||
aws-sdk-cloudfront (~> 1.0)
|
||||
|
|
@ -545,17 +591,17 @@ GEM
|
|||
aws-sdk-cloudhsmv2 (~> 1.0)
|
||||
aws-sdk-cloudtrail (~> 1.8)
|
||||
aws-sdk-cloudwatch (~> 1.13)
|
||||
aws-sdk-cloudwatchevents (>= 1.36, < 1.47)
|
||||
aws-sdk-cloudwatchevents (>= 1.36, < 1.63)
|
||||
aws-sdk-cloudwatchlogs (~> 1.13)
|
||||
aws-sdk-codecommit (~> 1.0)
|
||||
aws-sdk-codedeploy (~> 1.0)
|
||||
aws-sdk-codepipeline (~> 1.0)
|
||||
aws-sdk-cognitoidentity (>= 1.26, < 1.32)
|
||||
aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54)
|
||||
aws-sdk-cognitoidentity (>= 1.26, < 1.46)
|
||||
aws-sdk-cognitoidentityprovider (>= 1.46, < 1.77)
|
||||
aws-sdk-configservice (~> 1.21)
|
||||
aws-sdk-core (~> 3.0)
|
||||
aws-sdk-costandusagereportservice (~> 1.6)
|
||||
aws-sdk-databasemigrationservice (>= 1.42, < 1.54)
|
||||
aws-sdk-databasemigrationservice (>= 1.42, < 1.81)
|
||||
aws-sdk-dynamodb (~> 1.31)
|
||||
aws-sdk-ec2 (~> 1.70)
|
||||
aws-sdk-ecr (~> 1.18)
|
||||
|
|
@ -569,9 +615,9 @@ GEM
|
|||
aws-sdk-elasticloadbalancingv2 (~> 1.0)
|
||||
aws-sdk-elasticsearchservice (~> 1.0)
|
||||
aws-sdk-emr (~> 1.53.0)
|
||||
aws-sdk-eventbridge (~> 1.24.0)
|
||||
aws-sdk-eventbridge (>= 1.24, < 1.47)
|
||||
aws-sdk-firehose (~> 1.0)
|
||||
aws-sdk-glue (>= 1.71, < 1.89)
|
||||
aws-sdk-glue (>= 1.71, < 1.146)
|
||||
aws-sdk-guardduty (~> 1.31)
|
||||
aws-sdk-iam (~> 1.13)
|
||||
aws-sdk-kafka (~> 1.0)
|
||||
|
|
@ -581,7 +627,7 @@ GEM
|
|||
aws-sdk-mq (~> 1.40.0)
|
||||
aws-sdk-networkfirewall (>= 1.6.0)
|
||||
aws-sdk-networkmanager (>= 1.13.0)
|
||||
aws-sdk-organizations (>= 1.17, < 1.60)
|
||||
aws-sdk-organizations (>= 1.17, < 1.78)
|
||||
aws-sdk-ram (>= 1.21, < 1.27)
|
||||
aws-sdk-rds (~> 1.43)
|
||||
aws-sdk-redshift (~> 1.0)
|
||||
|
|
@ -603,15 +649,15 @@ GEM
|
|||
aws-sdk-ssm (~> 1.0)
|
||||
aws-sdk-states (>= 1.35, < 1.40)
|
||||
aws-sdk-synthetics (~> 1.19.0)
|
||||
aws-sdk-transfer (>= 1.26, < 1.35)
|
||||
aws-sdk-transfer (>= 1.26, < 1.74)
|
||||
aws-sdk-waf (~> 1.43.0)
|
||||
train-core (3.8.9)
|
||||
train-core (3.10.8)
|
||||
addressable (~> 2.5)
|
||||
ffi (!= 1.13.0)
|
||||
json (>= 1.8, < 3.0)
|
||||
mixlib-shellout (>= 2.0, < 4.0)
|
||||
net-scp (>= 1.2, < 4.0)
|
||||
net-ssh (>= 2.9, < 7.0)
|
||||
net-scp (>= 1.2, < 5.0)
|
||||
net-ssh (>= 2.9, < 8.0)
|
||||
train-habitat (0.2.22)
|
||||
train-winrm (0.2.13)
|
||||
winrm (>= 2.3.6, < 3.0)
|
||||
|
|
@ -635,13 +681,13 @@ GEM
|
|||
pastel (~> 0.8)
|
||||
strings (~> 0.2.0)
|
||||
tty-screen (~> 0.8)
|
||||
tzinfo (2.0.4)
|
||||
tzinfo (2.0.6)
|
||||
concurrent-ruby (~> 1.0)
|
||||
uber (0.1.0)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.8.1)
|
||||
unicode-display_width (2.1.0)
|
||||
unf_ext (0.0.8.2)
|
||||
unicode-display_width (2.5.0)
|
||||
unicode_utils (1.4.0)
|
||||
winrm (2.3.6)
|
||||
builder (>= 2.1.2)
|
||||
|
|
@ -672,6 +718,7 @@ DEPENDENCIES
|
|||
kitchen-inspec (>= 2.5.0)
|
||||
kitchen-salt (>= 0.7.2)
|
||||
kitchen-vagrant
|
||||
net-ssh (>= 7.0.0)
|
||||
|
||||
BUNDLED WITH
|
||||
2.1.2
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>`_
|
||||
- 274
|
||||
- 299
|
||||
* - :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>`_
|
||||
- 101
|
||||
- 102
|
||||
* - :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
|
||||
|
|
@ -52,8 +52,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/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='@babilen'>`
|
||||
- `@babilen <https://github.com/babilen>`_
|
||||
* - :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>`_
|
||||
- 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>`_
|
||||
|
|
@ -112,9 +112,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/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
|
||||
|
|
@ -187,6 +184,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/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
|
||||
|
|
@ -229,6 +229,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/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
|
||||
|
|
@ -328,9 +331,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/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-04-03.
|
||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2022-08-26.
|
||||
|
|
|
|||
|
|
@ -2,6 +2,78 @@
|
|||
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)
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ Git repositories under ``/srv/formulas`` and makes them available in the relevan
|
|||
'saltmain':
|
||||
- salt.formulas
|
||||
- salt.master
|
||||
|
||||
|
||||
|
||||
Pillar data can be used to customize all paths, URLs, etc. Here's a minimal pillar sample installing two formulas in the base environment:
|
||||
|
||||
|
|
@ -203,8 +203,8 @@ salt-minion packages on MacOS will not be upgraded by default. To enable package
|
|||
::
|
||||
|
||||
install_packages: True
|
||||
version: 2017.7.4
|
||||
salt_minion_pkg_source: https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg
|
||||
version: 3006.9
|
||||
salt_minion_pkg_source: https://packages.broadcom.com/artifactory/saltproject-generic/macos/3006.9/salt-3006.9-py3-x86_64.pkg
|
||||
|
||||
install_packages must indicate that the installation of a package is desired. If so, version will be used to compare the version of the installed .pkg against the downloaded one. If version is not set and a salt.pkg is already installed the .pkg will not be installed again.
|
||||
|
||||
|
|
|
|||
25
kitchen.macos.yml
Normal file
25
kitchen.macos.yml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
# -*- 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
|
||||
|
|
@ -9,8 +9,8 @@ driver:
|
|||
gui: false
|
||||
ssh:
|
||||
shell: /bin/sh
|
||||
<% unless ENV['CI'] %>
|
||||
linked_clone: true
|
||||
<% unless ENV['CI'] %>
|
||||
synced_folders:
|
||||
- - '.kitchen/kitchen-vagrant/%{instance_name}/vagrant'
|
||||
- '/vagrant'
|
||||
|
|
@ -51,15 +51,6 @@ 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
|
||||
|
|
@ -76,8 +67,8 @@ 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-py3.sls `
|
||||
source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
|
||||
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 `
|
||||
skip_verify=True makedirs=True
|
||||
exit 0
|
||||
# yamllint enable rule:line-length
|
||||
|
|
@ -100,8 +91,8 @@ 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-py3.sls `
|
||||
source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
|
||||
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 `
|
||||
skip_verify=True makedirs=True
|
||||
exit 0
|
||||
# yamllint enable rule:line-length
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ driver:
|
|||
|
||||
provisioner:
|
||||
salt_install: bootstrap
|
||||
salt_bootstrap_options: -pythonVersion 3 -version 3004-3
|
||||
salt_bootstrap_options: -pythonVersion 3 -version 3004.1-1
|
||||
# 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-py3.sls `
|
||||
source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
|
||||
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 `
|
||||
skip_verify=True makedirs=True
|
||||
# yamllint enable rule:line-length
|
||||
|
||||
|
|
|
|||
91
kitchen.yml
91
kitchen.yml
|
|
@ -43,6 +43,13 @@ 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
|
||||
|
|
@ -122,6 +129,13 @@ 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
|
||||
|
|
@ -148,15 +162,15 @@ platforms:
|
|||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
- name: fedora-35-master-py3
|
||||
- name: fedora-36-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-35
|
||||
image: saltimages/salt-master-py3:fedora-36
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
- name: fedora-34-master-py3
|
||||
- name: fedora-35-master-py3
|
||||
driver:
|
||||
image: saltimages/salt-master-py3:fedora-34
|
||||
image: saltimages/salt-master-py3:fedora-35
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
|
|
@ -252,6 +266,13 @@ platforms:
|
|||
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
|
||||
|
|
@ -278,15 +299,15 @@ platforms:
|
|||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
- name: fedora-35-3004-1-py3
|
||||
- name: fedora-36-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:fedora-35
|
||||
image: saltimages/salt-3004.1-py3:fedora-36
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
- name: fedora-34-3004-1-py3
|
||||
- name: fedora-35-3004-1-py3
|
||||
driver:
|
||||
image: saltimages/salt-3004.1-py3:fedora-34
|
||||
image: saltimages/salt-3004.1-py3:fedora-35
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3004
|
||||
|
|
@ -428,60 +449,6 @@ platforms:
|
|||
inputs:
|
||||
saltmajorversion: 3003
|
||||
|
||||
## SALT `3002.8`
|
||||
- name: debian-10-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:debian-10
|
||||
run_command: /lib/systemd/systemd
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: debian-9-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:debian-9
|
||||
run_command: /lib/systemd/systemd
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: ubuntu-2004-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:ubuntu-20.04
|
||||
run_command: /lib/systemd/systemd
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: ubuntu-1804-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:ubuntu-18.04
|
||||
run_command: /lib/systemd/systemd
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: centos-7-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:centos-7
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: amazonlinux-2-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:amazonlinux-2
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: oraclelinux-8-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:oraclelinux-8
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
- name: oraclelinux-7-3002-8-py3
|
||||
driver:
|
||||
image: saltimages/salt-3002.8-py3:oraclelinux-7
|
||||
verifier:
|
||||
inputs:
|
||||
saltmajorversion: 3002
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
name: inspec
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ salt:
|
|||
install_packages: true
|
||||
|
||||
# Optional: set salt version (if install_packages is set to true)
|
||||
version: 2017.7.2-1.el7
|
||||
version: '3006.9'
|
||||
|
||||
# Pin version provided under 'version' key by using apt-pinning
|
||||
# available only on Debian family OS-es
|
||||
|
|
@ -37,15 +37,18 @@ salt:
|
|||
salt_ssh: 'salt-ssh'
|
||||
pyinotify: 'python-pyinotify' # the package to be installed for pyinotify
|
||||
|
||||
# Set which salt repository to use, default to https://repo.saltproject.io
|
||||
# For older releases use https://archive.repo.saltproject.io
|
||||
repo: 'https://archive.repo.saltproject.io'
|
||||
# Set which salt repository to use
|
||||
# -> defaults to https://packages.broadcom.com/artifactory
|
||||
repo: 'https://packages.broadcom.com/artifactory'
|
||||
# yamllint disable rule:line-length
|
||||
repo_key_url: 'https://packages.broadcom.com/artifactory/api/security/keypair/SaltProjectKey/public'
|
||||
# yamllint enable rule:line-length
|
||||
|
||||
# Set which release of SaltStack to use, default to 'latest'
|
||||
# To get the available releases:
|
||||
# * http://repo.saltproject.io/yum/redhat/7/x86_64/
|
||||
# * http://repo.saltproject.io/apt/debian/8/amd64/
|
||||
release: '2018.3'
|
||||
# * https://packages.broadcom.com/artifactory/saltproject-rpm/
|
||||
# * https://packages.broadcom.com/artifactory/saltproject-deb
|
||||
release: '3006'
|
||||
|
||||
# MacOS has no package management.
|
||||
# Instead, we use file.managed to download an appropriate .pkg file and
|
||||
|
|
@ -57,8 +60,8 @@ salt:
|
|||
# NOTE: salt_minion_pkg_hash, if set, will be passed into file.managed's
|
||||
# source_hash, use URL or hash string
|
||||
# yamllint disable rule:line-length
|
||||
salt_minion_pkg_source: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg'
|
||||
salt_minion_pkg_hash: 'https://repo.saltproject.io/osx/salt-2017.7.4-py3-x86_64.pkg.md5'
|
||||
salt_minion_pkg_source: 'https://packages.broadcom.com/artifactory/saltproject-generic/macos/3006.9/salt-3006.9-py3-x86_64.pkg'
|
||||
salt_minion_pkg_hash: 'sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
|
||||
# yamllint enable rule:line-length
|
||||
|
||||
# tofs:
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ download-salt-minion:
|
|||
{% else %}
|
||||
- skip_verify: True
|
||||
{% endif %}
|
||||
- user: root
|
||||
- group: wheel
|
||||
- user: {{ salt_settings.rootuser }}
|
||||
- group: {{ salt_settings.rootgroup }}
|
||||
- mode: '0644'
|
||||
- unless:
|
||||
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
|
||||
|
|
@ -29,10 +29,13 @@ download-salt-minion:
|
|||
- macpackage: salt-minion
|
||||
- retry: {{ salt_settings.retry_options | json }}
|
||||
{%- elif "workaround https://github.com/saltstack/salt/issues/49348" %}
|
||||
cmd.run:
|
||||
- name: /usr/local/bin/brew install {{ salt_settings.salt_minion }}
|
||||
- onlyif: test -x /usr/local/bin/brew
|
||||
- runas: {{ salt_settings.rootuser }}
|
||||
{% if salt_settings.install_packages %}
|
||||
pkg.installed:
|
||||
- name: {{ salt_settings.salt_minion }}
|
||||
{%- if salt_settings.version is defined %}
|
||||
- version: {{ salt_settings.version }}
|
||||
{%- endif %}
|
||||
{% endif %}
|
||||
{%- endif %}
|
||||
|
||||
salt-minion-macos:
|
||||
|
|
@ -130,7 +133,7 @@ salt-minion:
|
|||
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
|
||||
- macpackage: salt-minion
|
||||
{%- elif grains.os == 'MacOS' %}
|
||||
- cmd: download-salt-minion
|
||||
- pkg: download-salt-minion
|
||||
{%- else %}
|
||||
- pkg: salt-minion
|
||||
{%- endif %}
|
||||
|
|
@ -155,7 +158,7 @@ restart-salt-minion:
|
|||
{%- if grains.os == 'MacOS' and salt_settings.salt_minion_pkg_source %}
|
||||
- macpackage: salt-minion
|
||||
{%- elif grains.os == 'MacOS' %}
|
||||
- cmd: download-salt-minion
|
||||
- pkg: download-salt-minion
|
||||
{%- else %}
|
||||
- pkg: salt-minion
|
||||
{%- endif %}
|
||||
|
|
@ -201,7 +204,7 @@ permissions-minion-config:
|
|||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
{%- else %}
|
||||
root
|
||||
{{ salt_settings.rootgroup }}
|
||||
{%- endif %}
|
||||
{%- if grains['kernel'] != 'Windows' %}
|
||||
- mode: 640
|
||||
|
|
@ -221,7 +224,7 @@ salt-minion-pki-dir:
|
|||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
{%- else %}
|
||||
root
|
||||
{{ salt_settings.rootgroup }}
|
||||
{%- endif %}
|
||||
{%- if grains['kernel'] != 'Windows' %}
|
||||
- mode: 700
|
||||
|
|
@ -240,7 +243,7 @@ permissions-minion.pem:
|
|||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
{%- else %}
|
||||
root
|
||||
{{ salt_settings.rootgroup }}
|
||||
{%- endif %}
|
||||
{%- if grains['kernel'] != 'Windows' %}
|
||||
- mode: 400
|
||||
|
|
@ -261,7 +264,7 @@ permissions-minion.pub:
|
|||
{%- if grains['kernel'] in ['FreeBSD', 'OpenBSD', 'NetBSD'] %}
|
||||
wheel
|
||||
{%- else %}
|
||||
root
|
||||
{{ salt_settings.rootgroup }}
|
||||
{%- endif %}
|
||||
{%- if grains['kernel'] != 'Windows' %}
|
||||
- mode: 644
|
||||
|
|
|
|||
|
|
@ -5,15 +5,9 @@
|
|||
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
|
||||
|
||||
{%- set osrelease = salt['grains.get']('osrelease', '') %}
|
||||
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
|
||||
{%- if salt_release.split('.')|length >= 3 %}
|
||||
{%- set salt_release = 'archive/' ~ salt_release %}
|
||||
{%- endif %}
|
||||
{%- set osfamily_lower = salt['grains.get']('os_family')|lower %}
|
||||
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
|
||||
{%- set oscodename = salt['grains.get']('oscodename') %}
|
||||
{%- set opensuse_repo_suffix = 'Leap_' ~ osrelease if salt['grains.get']('osfinger', '') == 'Leap-15' else 'Tumbleweed' %}
|
||||
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
|
||||
{%- 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' %}
|
||||
|
|
@ -25,9 +19,9 @@
|
|||
|
||||
|
||||
Debian:
|
||||
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
|
||||
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ osfamily_lower }}/{{ osmajorrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
|
||||
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
|
||||
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
|
||||
libgit2: libgit2-22
|
||||
pyinotify: python-pyinotify
|
||||
gitfs:
|
||||
|
|
@ -41,10 +35,10 @@ Debian:
|
|||
install_from_source: false
|
||||
|
||||
RedHat:
|
||||
pkgrepo_name: saltstack
|
||||
pkgrepo_humanname: SaltStack repo for RHEL/CentOS $releasever
|
||||
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}'
|
||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/$releasever/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
||||
pkgrepo_name: salt-repo-latest
|
||||
pkgrepo_humanname: Salt Repo for Salt LATEST release
|
||||
pkgrepo: '{{ salt_repo }}/saltproject-rpm/'
|
||||
key_url: '{{ salt_repo_key_url }}'
|
||||
pygit2: python-pygit2
|
||||
python_git: GitPython
|
||||
gitfs:
|
||||
|
|
@ -138,6 +132,7 @@ Windows:
|
|||
rootuser: {{ rootuser | d('') }}
|
||||
|
||||
MacOS:
|
||||
salt_master: saltstack
|
||||
salt_minion: salt
|
||||
salt_minion_pkg_source: ''
|
||||
salt_minion_pkg_hash: ''
|
||||
|
|
|
|||
|
|
@ -2,17 +2,12 @@
|
|||
# vim: ft=yaml
|
||||
---
|
||||
|
||||
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
|
||||
|
||||
{%- set osrelease = salt['grains.get']('osrelease', '') %}
|
||||
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
|
||||
{%- if salt_release.split('.')|length >= 3 %}
|
||||
{%- set salt_release = 'archive/' ~ salt_release %}
|
||||
{%- endif %}
|
||||
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
|
||||
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
|
||||
{%- 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') %}
|
||||
|
||||
Oracle Linux Server-7:
|
||||
pkgrepo_humanname: SaltStack repo for RHEL/CentOS {{ osmajorrelease }}
|
||||
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}'
|
||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/redhat/{{ osmajorrelease }}/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
||||
pkgrepo: '{{ salt_repo }}/saltproject-rpm/'
|
||||
key_url: '{{ salt_repo_key_url }}'
|
||||
|
|
|
|||
|
|
@ -4,16 +4,8 @@
|
|||
|
||||
{%- set py_ver_repr = salt['pillar.get']('salt:py_ver', '') %}
|
||||
|
||||
{%- set osrelease = salt['grains.get']('osrelease', '') %}
|
||||
{%- set salt_release = salt['pillar.get']('salt:release', 'latest') %}
|
||||
{%- if salt_release.split('.')|length >= 3 %}
|
||||
{%- set salt_release = 'archive/' ~ salt_release %}
|
||||
{%- endif %}
|
||||
{%- set os_lower = salt['grains.get']('os')|lower %}
|
||||
{%- set osmajorrelease = salt['grains.get']('osmajorrelease', osrelease)|string %}
|
||||
{%- set oscodename = salt['grains.get']('oscodename') %}
|
||||
{%- set os_family_lower = salt['grains.get']('os_family')|lower %}
|
||||
{%- set salt_repo = salt['pillar.get']('salt:repo', 'https://repo.saltproject.io') %}
|
||||
{%- 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') %}
|
||||
|
||||
Fedora:
|
||||
pygit2: python2-pygit2
|
||||
|
|
@ -21,14 +13,14 @@ Fedora:
|
|||
Amazon:
|
||||
pkgrepo_name: saltstack-amzn-repo
|
||||
pkgrepo_humanname: SaltStack repo for Amazon Linux 2
|
||||
pkgrepo: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}'
|
||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'yum' }}/amazon/2/$basearch/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
||||
pkgrepo: '{{ salt_repo }}/saltproject-rpm/'
|
||||
key_url: '{{ salt_repo_key_url }}'
|
||||
|
||||
Ubuntu:
|
||||
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=amd64] {{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }} {{ oscodename }} main'
|
||||
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/salt-archive-keyring.gpg'
|
||||
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
|
||||
key_url: '{{ salt_repo }}/{{ py_ver_repr or 'apt' }}/{{ os_lower }}/{{ osrelease }}/amd64/{{ salt_release }}/SALTSTACK-GPG-KEY.pub'
|
||||
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
|
||||
key_url: '{{ salt_repo_key_url }}'
|
||||
pygit2: python-pygit2
|
||||
gitfs:
|
||||
pygit2:
|
||||
|
|
@ -38,8 +30,8 @@ Ubuntu:
|
|||
install_from_package: Null
|
||||
|
||||
Raspbian:
|
||||
pkgrepo: 'deb [signed-by=/usr/share/keyrings/salt-archive-keyring.gpg arch=armhf] {{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }} {{ oscodename }} main'
|
||||
pkgrepo_keyring: '{{ salt_repo }}/{{ py_ver_repr or 'py3' }}/{{ os_family_lower }}/{{ osmajorrelease }}/armhf/{{ salt_release }}/salt-archive-keyring.gpg'
|
||||
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:
|
||||
salt_master: salt
|
||||
|
|
@ -66,15 +58,15 @@ MacOS:
|
|||
salt_minion_macos_plist_hash: 26b33da12e0d8960ee96b488c8352002c22a377c19bf3df3f986a1e49eca8b20
|
||||
|
||||
FreeBSD:
|
||||
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
|
||||
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
|
||||
|
||||
# If `osfingermap.yaml` is introduced in the future, perhaps better to move to there,
|
||||
# since this is probably specific to `OpenBSD-6`
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ salt-pkgrepo-clean-saltstack-debian:
|
|||
|
||||
salt-pkgrepo-clean-saltstack-debian-apt-key:
|
||||
file.absent:
|
||||
- name: /usr/share/keyrings/salt-archive-keyring.gpg
|
||||
- name: /etc/apt/keyrings/salt-archive-keyring.pgp
|
||||
|
|
|
|||
|
|
@ -10,4 +10,4 @@ salt-pkgrepo-clean-saltstack-debian:
|
|||
|
||||
salt-pkgrepo-clean-saltstack-debian-apt-key:
|
||||
file.absent:
|
||||
- name: /usr/share/keyrings/salt-archive-keyring.gpg
|
||||
- name: /etc/apt/keyrings/salt-archive-keyring.pgp
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
salt-pkgrepo-install-saltstack-debian-keyring:
|
||||
file.managed:
|
||||
- name: /usr/share/keyrings/salt-archive-keyring.gpg
|
||||
- name: /etc/apt/keyrings/salt-archive-keyring.pgp
|
||||
- source: {{ salt_settings.pkgrepo_keyring }}
|
||||
- source_hash: {{ salt_settings.pkgrepo_keyring_hash }}
|
||||
- require_in:
|
||||
|
|
|
|||
|
|
@ -8,11 +8,12 @@ salt-pkgrepo-install-saltstack-redhat:
|
|||
- name: {{ salt_settings.pkgrepo_name }}
|
||||
- humanname: {{ salt_settings.pkgrepo_humanname }}
|
||||
- baseurl: {{ salt_settings.pkgrepo }}
|
||||
- priority: 10
|
||||
- enabled: 1
|
||||
- enabled_metadata: 1
|
||||
- gpgcheck: 1
|
||||
- gpgkey: {{ salt_settings.key_url }}
|
||||
{%- if grains['os']|lower in ['amazon'] %}
|
||||
- failovermethod: priority
|
||||
- priority: 10
|
||||
{%- endif %}
|
||||
{%- endif %}
|
||||
|
|
|
|||
|
|
@ -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.run"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %}
|
||||
{%- if not salt["cmd.shell"]("zypper lr --uri | grep " ~ salt_settings.pkgrepo) %}
|
||||
salt-pkgrepo-install-saltstack-suse:
|
||||
pkgrepo.managed:
|
||||
- name: systemsmanagement_saltstack_products
|
||||
|
|
|
|||
|
|
@ -5,9 +5,11 @@ pkgs =
|
|||
when 'arch'
|
||||
%w[salt]
|
||||
when /bsd$/
|
||||
%w[py38-salt]
|
||||
%w[py39-salt]
|
||||
when 'windows'
|
||||
['Salt Minion']
|
||||
when 'mac_os_x'
|
||||
%w[salt saltstack]
|
||||
else
|
||||
%w[salt-master salt-minion]
|
||||
end
|
||||
|
|
|
|||
|
|
@ -6,6 +6,14 @@ 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
|
||||
|
|
|
|||
|
|
@ -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/3002 stretch main
|
||||
pkgrepo_keyring: https://repo.saltproject.io/py3/debian/9/amd64/3002/salt-archive-keyring.gpg
|
||||
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
|
||||
pkgrepo_keyring_hash: sha256=ea38e0cdbd8dc53e1af154a8d711a2a321a69f81188062dc5cde9d54df2b8c47
|
||||
py_ver: py3
|
||||
pyinotify: python-pyinotify
|
||||
python_dulwich: python-dulwich
|
||||
python_git: python-git
|
||||
release: '3002'
|
||||
release: '3003'
|
||||
restart_via_at: false
|
||||
retry_options:
|
||||
attempts: 5
|
||||
|
|
|
|||
117
test/integration/default/files/_mapdata/fedora-36.yaml
Normal file
117
test/integration/default/files/_mapdata/fedora-36.yaml
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
# 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: ''
|
||||
|
|
@ -88,9 +88,9 @@ values:
|
|||
pin_version: false
|
||||
pkgrepo: ''
|
||||
py_ver: py3
|
||||
pygit2: py38-pygit2
|
||||
python_dulwich: py38-dulwich
|
||||
python_git: py38-gitpython
|
||||
pygit2: py39-pygit2
|
||||
python_dulwich: py39-dulwich
|
||||
python_git: py39-gitpython
|
||||
release: '3004'
|
||||
restart_via_at: false
|
||||
retry_options:
|
||||
|
|
@ -100,14 +100,14 @@ values:
|
|||
until: true
|
||||
rootgroup: wheel
|
||||
rootuser: root
|
||||
salt_api: py38-salt
|
||||
salt_cloud: py38-salt
|
||||
salt_master: py38-salt
|
||||
salt_api: py39-salt
|
||||
salt_cloud: py39-salt
|
||||
salt_master: py39-salt
|
||||
salt_master_macos_plist_hash: ''
|
||||
salt_minion: py38-salt
|
||||
salt_minion: py39-salt
|
||||
salt_minion_macos_plist_hash: ''
|
||||
salt_ssh: py38-salt
|
||||
salt_syndic: py38-salt
|
||||
salt_ssh: py39-salt
|
||||
salt_syndic: py39-salt
|
||||
ssh_roster: {}
|
||||
syndic_service: salt_syndic
|
||||
use_pip: false
|
||||
|
|
|
|||
|
|
@ -88,9 +88,9 @@ values:
|
|||
pin_version: false
|
||||
pkgrepo: ''
|
||||
py_ver: py3
|
||||
pygit2: py38-pygit2
|
||||
python_dulwich: py38-dulwich
|
||||
python_git: py38-gitpython
|
||||
pygit2: py39-pygit2
|
||||
python_dulwich: py39-dulwich
|
||||
python_git: py39-gitpython
|
||||
release: '3004'
|
||||
restart_via_at: false
|
||||
retry_options:
|
||||
|
|
@ -100,14 +100,14 @@ values:
|
|||
until: true
|
||||
rootgroup: wheel
|
||||
rootuser: root
|
||||
salt_api: py38-salt
|
||||
salt_cloud: py38-salt
|
||||
salt_master: py38-salt
|
||||
salt_api: py39-salt
|
||||
salt_cloud: py39-salt
|
||||
salt_master: py39-salt
|
||||
salt_master_macos_plist_hash: ''
|
||||
salt_minion: py38-salt
|
||||
salt_minion: py39-salt
|
||||
salt_minion_macos_plist_hash: ''
|
||||
salt_ssh: py38-salt
|
||||
salt_syndic: py38-salt
|
||||
salt_ssh: py39-salt
|
||||
salt_syndic: py39-salt
|
||||
ssh_roster: {}
|
||||
syndic_service: salt_syndic
|
||||
use_pip: false
|
||||
|
|
|
|||
115
test/integration/default/files/_mapdata/mac_os_x-10.yaml
Normal file
115
test/integration/default/files/_mapdata/mac_os_x-10.yaml
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
# 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: ''
|
||||
115
test/integration/default/files/_mapdata/mac_os_x-11.yaml
Normal file
115
test/integration/default/files/_mapdata/mac_os_x-11.yaml
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
# 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: ''
|
||||
115
test/integration/default/files/_mapdata/mac_os_x-12.yaml
Normal file
115
test/integration/default/files/_mapdata/mac_os_x-12.yaml
Normal file
|
|
@ -0,0 +1,115 @@
|
|||
# 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: ''
|
||||
|
|
@ -24,4 +24,5 @@ supports:
|
|||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
|
|
|||
|
|
@ -21,4 +21,5 @@ supports:
|
|||
- platform-name: gentoo
|
||||
- platform-name: almalinux
|
||||
- platform-name: rocky
|
||||
- platform-name: mac_os_x
|
||||
- platform: windows
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ 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]
|
||||
|
|
@ -95,6 +97,8 @@ class SystemResource < Inspec.resource(1)
|
|||
# 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'
|
||||
|
|
|
|||
|
|
@ -8,6 +8,4 @@ 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
|
||||
...
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue