From f61ad7fb74545084b0b5aad48d5e5d511d36a876 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 8 Aug 2018 09:43:04 -0400 Subject: [PATCH] Fix TOP File Logic and syntac error in logstash state --- pillar/nodes/schedule.sls | 5 +++++ pillar/top.sls | 5 +++++ salt/logstash/init.sls | 3 +-- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 pillar/nodes/schedule.sls diff --git a/pillar/nodes/schedule.sls b/pillar/nodes/schedule.sls new file mode 100644 index 000000000..8377117e9 --- /dev/null +++ b/pillar/nodes/schedule.sls @@ -0,0 +1,5 @@ +schedule: + highstate: + funtion: state.highstate + minutes: 15 + maxrunning: 1 diff --git a/pillar/top.sls b/pillar/top.sls index bf024aa8a..8ecaa3e08 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -9,3 +9,8 @@ base: - masters.{{ grains.host }} - static - firewall.* + + 'G@role:so-node': + - nodes.schedule + - nodes.{{ grains.host }} + - static diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 5ad526586..60cc138f1 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -32,7 +32,7 @@ {% else %} - {% set nodetype = salt['pillar_get']('node:node_type', 'storage') %} + {% set nodetype = salt['pillar.get']('node:node_type', 'storage') %} {% endif %} @@ -136,4 +136,3 @@ so-logstash: - /etc/pki/filebeat.crt:/usr/share/logstash/filebeat.crt:ro - /etc/pki/filebeat.key:/usr/share/logstash/filebeat.key:ro - /etc/pki/ca.crt:/usr/share/filebeat/ca.crt:ro -