瀏覽代碼

Merge pull request #20 from noelmcloughlin/suseSupport

notify nosupport if SLES version < 15
tags/v0.6.2
Niels Abspoel 6 年之前
父節點
當前提交
1ddb09137c
沒有連結到貢獻者的電子郵件帳戶。
共有 1 個檔案被更改,包括 12 行新增1 行删除
  1. +12
    -1
      firewalld/init.sls

+ 12
- 1
firewalld/init.sls 查看文件

@@ -5,7 +5,16 @@
#
{% from "firewalld/map.jinja" import firewalld with context %}

{% if salt['pillar.get']('firewalld:enabled') %}
{% if salt['grains.get']('osfullname') == "SLES" and salt['grains.get']('osmajorrelease')|int < 15 %}

firewalld-unsupported:
test.show_notification:
- text: |
Firewalld is not supported on {{ grains['osfinger'] }}
See https://www.suse.com/releasenotes/x86_64/SUSE-SLES/15/#fate-323460

{% elif salt['pillar.get']('firewalld:enabled') %}

include:
- firewalld.config
- firewalld.ipsets
@@ -43,8 +52,10 @@ reload_firewalld:
- service: service_firewalld

{% else %}

service_firewalld:
service.dead:
- name: {{ firewalld.service }}
- enable: False # don't start on boot

{% endif %}

Loading…
取消
儲存