瀏覽代碼

Merge "Move cert params to map.jinja"

pull/56/head
mcp-jenkins 7 年之前
父節點
當前提交
f0178ad63a
共有 2 個文件被更改,包括 5 次插入7 次删除
  1. +4
    -0
      salt/map.jinja
  2. +1
    -7
      salt/minion/cert.sls

+ 4
- 0
salt/map.jinja 查看文件

@@ -98,6 +98,8 @@ Debian:
- python-m2crypto
- python-psutil
- python-yaml
cert_pkgs:
- ca-certificates
Gentoo:
pkgs:
- app-admin/salt
@@ -110,6 +112,8 @@ RedHat:
- m2crypto
- psutils
- PyYAML
cert_pkgs:
- ca-certificates
{%- endload %}

{%- if pillar.salt.minion is defined %}

+ 1
- 7
salt/minion/cert.sls 查看文件

@@ -171,13 +171,7 @@ salt_minion_cert_{{ cert_name }}_all:

salt_ca_certificates_packages:
pkg.installed:
{%- if grains.os_family == 'Debian' %}
- name: ca-certificates
{%- elif grains.os_family == 'RedHat' %}
- name: ca-certificates
{%- else %}
- name: []
{%- endif %}
- names: {{ minion.cert_pkgs }}

salt_update_certificates:
cmd.wait:

Loading…
取消
儲存