Browse Source

fix(gentoo): use `retry_options` to avoid spurious service failures

Use the `retry_options` on Gentoo, similar to how its already being used
across the state files for FreeBSD, since we're getting failures such as
this one:

* https://gitlab.com/myii/salt-formula/-/jobs/2285180374
tags/v1.10.2
Imran Iqbal 2 years ago
parent
commit
d00c069e25
No account linked to committer's email address
5 changed files with 5 additions and 5 deletions
  1. +1
    -1
      salt/api.sls
  2. +1
    -1
      salt/master.sls
  3. +1
    -1
      salt/minion.sls
  4. +1
    -1
      salt/standalone.sls
  5. +1
    -1
      salt/syndic.sls

+ 1
- 1
salt/api.sls View File

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' %}
{%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
- retry: {{ salt_settings.retry_options | json }} - retry: {{ salt_settings.retry_options | json }}
{%- endif %} {%- endif %}
- require: - require:

+ 1
- 1
salt/master.sls View File

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' %}
{%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
- retry: {{ salt_settings.retry_options | json }} - retry: {{ salt_settings.retry_options | json }}
{%- endif %} {%- endif %}
- watch: - watch:

+ 1
- 1
salt/minion.sls View File

service.{{ salt_settings.minion_service_details.state }}: service.{{ salt_settings.minion_service_details.state }}:
- enable: {{ salt_settings.minion_service_details.enabled }} - enable: {{ salt_settings.minion_service_details.enabled }}
- name: {{ salt_settings.minion_service }} - name: {{ salt_settings.minion_service }}
{%- if grains.os_family == 'FreeBSD' %}
{%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
- retry: {{ salt_settings.retry_options | json }} - retry: {{ salt_settings.retry_options | json }}
{%- endif %} {%- endif %}
- watch: - watch:

+ 1
- 1
salt/standalone.sls View File

- enable: False - enable: False
{%- endif %} {%- endif %}
- name: {{ salt_settings.minion_service }} - name: {{ salt_settings.minion_service }}
{%- if grains.os_family == 'FreeBSD' %}
{%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
- retry: {{ salt_settings.retry_options | json }} - retry: {{ salt_settings.retry_options | json }}
{%- endif %} {%- endif %}
- require: - require:

+ 1
- 1
salt/syndic.sls View File

service.running: service.running:
- enable: True - enable: True
- name: {{ salt_settings.syndic_service }} - name: {{ salt_settings.syndic_service }}
{%- if grains.os_family == 'FreeBSD' %}
{%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
- retry: {{ salt_settings.retry_options | json }} - retry: {{ salt_settings.retry_options | json }}
{%- endif %} {%- endif %}
- require: - require:

Loading…
Cancel
Save