diff --git a/salt/ca/files/signing_policies.conf b/salt/ca/files/signing_policies.conf index 7f9c68750..4fc04aacc 100644 --- a/salt/ca/files/signing_policies.conf +++ b/salt/ca/files/signing_policies.conf @@ -1,6 +1,3 @@ -mine_functions: - x509.get_pem_entries: [/etc/pki/ca.crt] - x509_signing_policies: filebeat: - minions: '*' diff --git a/salt/salt/etc/minion.d/mine_functions.conf.jinja b/salt/salt/etc/minion.d/mine_functions.conf.jinja index 3851238fd..529dee3b0 100644 --- a/salt/salt/etc/minion.d/mine_functions.conf.jinja +++ b/salt/salt/etc/minion.d/mine_functions.conf.jinja @@ -2,7 +2,7 @@ mine_interval: 25 mine_functions: network.ip_addrs: - interface: {{ pillar.host.mainint }} -{% if grains.role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] -%} +{%- if grains.role in ['so-eval','so-import','so-manager','so-managersearch','so-standalone'] %} x509.get_pem_entries: - glob_path: '/etc/pki/ca.crt' {% endif -%}