2
0

fix(freebsd): use retry_options to avoid spurious service failures

Use the `retry_options` already being used for the Salt minion service,
since we're getting failures such as this one:

* https://github.com/myii/salt-formula/runs/2415072504

This is made worse by the fact that GitHub Actions cannot re-run a
single job (at the current time).
This commit is contained in:
Imran Iqbal 2021-04-23 09:13:59 +01:00
parent 0e96047b16
commit 698b7eae59
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
4 changed files with 12 additions and 0 deletions

View File

@ -15,6 +15,9 @@ salt-api:
service.{{ salt_settings.api_service_details.state }}: service.{{ salt_settings.api_service_details.state }}:
- enable: {{ salt_settings.api_service_details.enabled }} - enable: {{ salt_settings.api_service_details.enabled }}
- name: {{ salt_settings.api_service }} - name: {{ salt_settings.api_service }}
{%- if grains.os_family == 'FreeBSD' %}
- retry: {{ salt_settings.retry_options | json }}
{%- endif %}
- require: - require:
- service: {{ salt_settings.master_service }} - service: {{ salt_settings.master_service }}
- watch: - watch:

View File

@ -52,6 +52,9 @@ salt-master:
service.{{ salt_settings.master_service_details.state }}: service.{{ salt_settings.master_service_details.state }}:
- enable: {{ salt_settings.master_service_details.enabled }} - enable: {{ salt_settings.master_service_details.enabled }}
- name: {{ salt_settings.master_service }} - name: {{ salt_settings.master_service }}
{%- if grains.os_family == 'FreeBSD' %}
- retry: {{ salt_settings.retry_options | json }}
{%- endif %}
- watch: - watch:
{%- if grains.kernel|lower == 'darwin' %} {%- if grains.kernel|lower == 'darwin' %}
- file: salt-master-macos - file: salt-master-macos

View File

@ -25,6 +25,9 @@ salt-minion-standalone:
- enable: False - enable: False
{%- endif %} {%- endif %}
- name: {{ salt_settings.minion_service }} - name: {{ salt_settings.minion_service }}
{%- if grains.os_family == 'FreeBSD' %}
- retry: {{ salt_settings.retry_options | json }}
{%- endif %}
- require: - require:
{% if salt_settings.install_packages %} {% if salt_settings.install_packages %}
- pkg: salt-minion-standalone - pkg: salt-minion-standalone

View File

@ -18,6 +18,9 @@ salt-syndic:
service.running: service.running:
- enable: True - enable: True
- name: {{ salt_settings.syndic_service }} - name: {{ salt_settings.syndic_service }}
{%- if grains.os_family == 'FreeBSD' %}
- retry: {{ salt_settings.retry_options | json }}
{%- endif %}
- require: - require:
- service: salt-master - service: salt-master
- watch: - watch: