From 4739f3e9e90524601b2d48660640177c11b16be8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 24 May 2018 21:01:48 -0400 Subject: [PATCH] Logstash Module - Fix an issue with logstash config --- .../{conf.enabled.txt.master => conf.enabled.txt.so-master} | 0 salt/logstash/init.sls | 2 +- salt/ssl/init.sls | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename salt/logstash/conf/{conf.enabled.txt.master => conf.enabled.txt.so-master} (100%) diff --git a/salt/logstash/conf/conf.enabled.txt.master b/salt/logstash/conf/conf.enabled.txt.so-master similarity index 100% rename from salt/logstash/conf/conf.enabled.txt.master rename to salt/logstash/conf/conf.enabled.txt.so-master diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index f23c944e2..59d4560a1 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -28,7 +28,7 @@ {% if grains['role'] == 'so-master' %} - {% set nodetype = master %} + {% set nodetype = salt['grains.get']('role', '') %} {% else %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index 5476815e8..3e06912bb 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -4,7 +4,7 @@ /usr/local/share/ca-certificates/intca.crt: x509.pem_managed: - - text: {{ salt['mine.get']('master', 'x509.get_pem_entries')['ca']['/etc/pki/ca.crt']|replace('\n', '') }} + - text: {{ salt['mine.get']('master', 'x509.get_pem_entries')['master']['/etc/pki/ca.crt']|replace('\n', '') }} # Request a cert and drop it where it needs to go to be distributed /etc/pki/filebeat.crt: