Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

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
This commit is contained in:
Imran Iqbal 2022-04-03 10:26:20 +01:00
parent e9cb3d2728
commit d00c069e25
No known key found for this signature in database
GPG Key ID: 6D8629439D2B7819
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/api.sls
View File

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

2
salt/master.sls
View File

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

2
salt/minion.sls
View File

@ -97,7 +97,7 @@ salt-minion:
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:

2
salt/standalone.sls
View File

@ -25,7 +25,7 @@ salt-minion-standalone:
- 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:

2
salt/syndic.sls
View File

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