瀏覽代碼

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

Use the `retry_options` already being used for the Salt minion service,
since we're getting failures such as this one:

* https://github.com/myii/salt-formula/runs/2415072504

This is made worse by the fact that GitHub Actions cannot re-run a
single job (at the current time).
tags/v1.8.4
Imran Iqbal 3 年之前
父節點
當前提交
698b7eae59
沒有連結到貢獻者的電子郵件帳戶。
共有 4 個檔案被更改,包括 12 行新增0 行删除
  1. +3
    -0
      salt/api.sls
  2. +3
    -0
      salt/master.sls
  3. +3
    -0
      salt/standalone.sls
  4. +3
    -0
      salt/syndic.sls

+ 3
- 0
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:

+ 3
- 0
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

+ 3
- 0
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

+ 3
- 0
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:

Loading…
取消
儲存