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
saltstack-formulas · Apr 3, 2022 · d00c069 · d00c069
1 parent e9cb3d2
commit d00c069
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/salt/api.sls b/salt/api.sls
@@ -15,7 +15,7 @@ salt-api:
   service.{{ salt_settings.api_service_details.state }}:
     - enable: {{ salt_settings.api_service_details.enabled }}
     - name: {{ salt_settings.api_service }}
-    {%- if grains.os_family == 'FreeBSD' %}
+    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
     - retry: {{ salt_settings.retry_options | json }}
     {%- endif %}
     - require:

diff --git a/salt/master.sls b/salt/master.sls
@@ -54,7 +54,7 @@ salt-master:
   service.{{ salt_settings.master_service_details.state }}:
     - enable: {{ salt_settings.master_service_details.enabled }}
     - name: {{ salt_settings.master_service }}
-    {%- if grains.os_family == 'FreeBSD' %}
+    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
     - retry: {{ salt_settings.retry_options | json }}
     {%- endif %}
     - watch:

diff --git a/salt/minion.sls b/salt/minion.sls
@@ -97,7 +97,7 @@ salt-minion:
   service.{{ salt_settings.minion_service_details.state }}:
     - enable: {{ salt_settings.minion_service_details.enabled }}
     - name: {{ salt_settings.minion_service }}
-    {%- if grains.os_family == 'FreeBSD' %}
+    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
     - retry: {{ salt_settings.retry_options | json }}
     {%- endif %}
     - watch:

diff --git a/salt/standalone.sls b/salt/standalone.sls
@@ -25,7 +25,7 @@ salt-minion-standalone:
     - enable: False
   {%- endif %}
     - name: {{ salt_settings.minion_service }}
-    {%- if grains.os_family == 'FreeBSD' %}
+    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
     - retry: {{ salt_settings.retry_options | json }}
     {%- endif %}
     - require:

diff --git a/salt/syndic.sls b/salt/syndic.sls
@@ -18,7 +18,7 @@ salt-syndic:
   service.running:
     - enable: True
     - name: {{ salt_settings.syndic_service }}
-    {%- if grains.os_family == 'FreeBSD' %}
+    {%- if grains.os_family in ['FreeBSD', 'Gentoo'] %}
     - retry: {{ salt_settings.retry_options | json }}
     {%- endif %}
     - require: