Merge pull request #505 from myii/fix/use-retry-options-for-all-services-on-freebsd

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

salt/api.sls

@@ -15,6 +15,9 @@ 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' %}
+    - retry: {{ salt_settings.retry_options | json }}
+    {%- endif %}
     - require:
       - service: {{ salt_settings.master_service }}
     - watch:

salt/master.sls

@@ -52,6 +52,9 @@ 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' %}
+    - retry: {{ salt_settings.retry_options | json }}
+    {%- endif %}
     - watch:
            {%- if grains.kernel|lower == 'darwin' %}
       - file: salt-master-macos

salt/standalone.sls

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

salt/syndic.sls

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