Browse Source

Move cert params to map.jinja

Change-Id: I1d09c5297440a6469cfaabbfc67d1f1c11decece
pull/56/head
Martin Polreich 7 years ago
parent
commit
278324fd0c
2 changed files with 5 additions and 7 deletions
  1. +4
    -0
      salt/map.jinja
  2. +1
    -7
      salt/minion/cert.sls

+ 4
- 0
salt/map.jinja View File

- python-m2crypto - python-m2crypto
- python-psutil - python-psutil
- python-yaml - python-yaml
cert_pkgs:
- ca-certificates
Gentoo: Gentoo:
pkgs: pkgs:
- app-admin/salt - app-admin/salt
- m2crypto - m2crypto
- psutils - psutils
- PyYAML - PyYAML
cert_pkgs:
- ca-certificates
{%- endload %} {%- endload %}


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

+ 1
- 7
salt/minion/cert.sls View File



salt_ca_certificates_packages: salt_ca_certificates_packages:
pkg.installed: 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: salt_update_certificates:
cmd.wait: cmd.wait:

Loading…
Cancel
Save