saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

refactor(retry_options): provide options from defaults/pillar

Browse Source
This commit is contained in:
Imran Iqbal 2021-03-26 17:59:40 +00:00
parent e31a56e7a3
commit bbd7286240
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
55 changed files with 272 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pillar.example
View File

@ -369,6 +369,13 @@ salt:
- 'deploy':
- /srv/salt/reactors/deploy.sls
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
retry_options:
attempts: 2
until: true
interval: 10
splay: 10
salt_cloud_certs:
aws:
pem: |

7
salt/defaults.yaml
View File

@ -85,6 +85,13 @@ salt:
profiles: salt://salt/files/cloud.profiles.d
maps: salt://salt/files/cloud.maps.d
# https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
retry_options:
attempts: 2
until: true
interval: 10
splay: 10
salt_formulas:
list: {} # via pillar data
checkout_orig_branch: false

6
salt/master.sls
View File

@ -15,11 +15,7 @@ salt-master-macos:
- name: /Library/LaunchDaemons/com.saltstack.salt.master.plist
- source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
- source_hash: {{ salt_settings.salt_master_macos_plist_hash }}
- retry:
attempts: 2
until: True
interval: 10
splay: 10
- retry: {{ salt_settings.retry_options | json }}
- require_in:
- service: salt-master
{%- endif %}

12
salt/minion.sls
View File

@ -27,11 +27,7 @@ download-salt-minion:
- test -n "{{ salt_settings.version }}" && '/opt/salt/bin/salt-minion --version=.*{{ salt_settings.version }}.*'
- require_in:
- macpackage: salt-minion
- retry:
attempts: 2
until: True
interval: 10
splay: 10
- 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 }}
@ -45,11 +41,7 @@ salt-minion-macos:
- name: /Library/LaunchDaemons/com.saltstack.salt.minion.plist
- source: https://raw.githubusercontent.com/saltstack/salt/master/pkg/osx/scripts/com.saltstack.salt.master.plist
- source_hash: {{ salt_settings.salt_minion_macos_plist_hash }}
- retry:
attempts: 2
until: True
interval: 10
splay: 10
- retry: {{ salt_settings.retry_options | json }}
- require_in:
- service: salt-minion
- watch_in:

5
test/integration/v3000-py2/files/_mapdata/ubuntu-16.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py2/files/_mapdata/ubuntu-18.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/amazonlinux-2.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/centos-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/centos-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/debian-10.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/debian-9.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3000-py3/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3000-py3/files/_mapdata/opensuse-15.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/oraclelinux-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3000-py3/files/_mapdata/windows-2019-server.yaml
View File

@ -90,6 +90,11 @@ values:
python_git: python-git
release: '3000'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: kitchen
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/amazonlinux-2.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/centos-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/centos-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/debian-10.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/debian-9.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/fedora-32.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/fedora-33.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3001-py3/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3001-py3/files/_mapdata/opensuse-15.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/oraclelinux-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3001-py3/files/_mapdata/ubuntu-20.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3001'
restart_via_at: false
retry_options:
attempts: 2
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/amazonlinux-2.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/arch-base-latest.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python2-gitpython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt

5
test/integration/v3002-py3/files/_mapdata/centos-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/centos-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/debian-10.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/debian-9.yaml
View File

@ -93,6 +93,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/fedora-32.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/fedora-33.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysd.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3002-py3/files/_mapdata/gentoo-2-sysv.yaml
View File

@ -91,6 +91,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: app-admin/salt

5
test/integration/v3002-py3/files/_mapdata/opensuse-15.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/opensuse-tumbleweed.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/oraclelinux-7.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/oraclelinux-8.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: GitPython
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/ubuntu-16.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/ubuntu-18.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/ubuntu-20.yaml
View File

@ -94,6 +94,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: root
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/windows-2016-server.yaml
View File

@ -90,6 +90,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: kitchen
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/windows-2019-server.yaml
View File

@ -90,6 +90,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: kitchen
salt_api: salt-api

5
test/integration/v3002-py3/files/_mapdata/windows-8.yaml
View File

@ -90,6 +90,11 @@ values:
python_git: python-git
release: '3002'
restart_via_at: false
retry_options:
attempts: 5
interval: 10
splay: 10
until: true
rootgroup: root
rootuser: vagrant
salt_api: salt-api