Merge "Move cert params to map.jinja"
diff --git a/salt/map.jinja b/salt/map.jinja
index 8920fa6..5df6d2b 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -98,6 +98,8 @@
- python-m2crypto
- python-psutil
- python-yaml
+ cert_pkgs:
+ - ca-certificates
Gentoo:
pkgs:
- app-admin/salt
@@ -110,6 +112,8 @@
- m2crypto
- psutils
- PyYAML
+ cert_pkgs:
+ - ca-certificates
{%- endload %}
{%- if pillar.salt.minion is defined %}
diff --git a/salt/minion/cert.sls b/salt/minion/cert.sls
index c04215a..f37924f 100644
--- a/salt/minion/cert.sls
+++ b/salt/minion/cert.sls
@@ -171,13 +171,7 @@
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: