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

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
This commit is contained in:
Imran Iqbal 2021-04-24 17:09:12 +01:00 committed by GitHub
parent 0e96047b16 698b7eae59
commit 65f9f27fc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/api.sls
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:

3
salt/master.sls
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

3
salt/standalone.sls
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

3
salt/syndic.sls
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: