Pārlūkot izejas kodu

Move cert params to map.jinja

Change-Id: I1d09c5297440a6469cfaabbfc67d1f1c11decece
pull/56/head
Martin Polreich pirms 7 gadiem
vecāks
revīzija
278324fd0c
2 mainītis faili ar 5 papildinājumiem un 7 dzēšanām
  1. +4
    -0
      salt/map.jinja
  2. +1
    -7
      salt/minion/cert.sls

+ 4
- 0
salt/map.jinja Parādīt failu

@@ -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 Parādīt failu

@@ -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:

Notiek ielāde…
Atcelt
Saglabāt