diff --git a/salt/elastalert/init.sls b/salt/elastalert/init.sls index 8ee844c91..3b0b3fafe 100644 --- a/salt/elastalert/init.sls +++ b/salt/elastalert/init.sls @@ -15,7 +15,7 @@ {% set VERSION = salt['pillar.get']('static:soversion', 'HH1.2.2') %} {% set MASTER = salt['grains.get']('master') %} -{% if grains['role'] == ['so-eval','so-mastersearch', 'so-master', 'so-standalone'] %} +{% if grains['role'] in ['so-eval','so-mastersearch', 'so-master', 'so-standalone'] %} {% set esalert = salt['pillar.get']('master:elastalert', '1') %} {% set esip = salt['pillar.get']('master:mainip', '') %} {% set esport = salt['pillar.get']('master:es_port', '') %} diff --git a/salt/logstash/init.sls b/salt/logstash/init.sls index 906a2b33c..ba0e015f4 100644 --- a/salt/logstash/init.sls +++ b/salt/logstash/init.sls @@ -29,7 +29,7 @@ {% elif grains['role'] == 'so-node' or grains['role'] == 'so-heavynode' %} {% set lsheap = salt['pillar.get']('node:lsheap', '') %} {% set nodetype = salt['pillar.get']('node:node_type', 'storage') %} -{% elif grains['role'] == ['so-eval','so-mastersearch', 'so-master', 'so-standalone'] %} +{% elif grains['role'] in ['so-eval','so-mastersearch', 'so-master', 'so-standalone'] %} {% set lsheap = salt['pillar.get']('master:lsheap', '') %} {% set freq = salt['pillar.get']('master:freq', '0') %} {% set dstats = salt['pillar.get']('master:domainstats', '0') %} diff --git a/salt/ssl/init.sls b/salt/ssl/init.sls index f7fdbd7e5..e3142fa22 100644 --- a/salt/ssl/init.sls +++ b/salt/ssl/init.sls @@ -142,7 +142,7 @@ fbcrtlink: backup: True {% endif %} -{% if grains['role'] == in ['so-sensor', 'so-master', 'so-node', 'so-eval', 'so-helix', 'so-mastersearch', 'so-heavynode', 'so-fleet', 'so-standalone'] %} +{% if grains['role'] in ['so-sensor', 'so-master', 'so-node', 'so-eval', 'so-helix', 'so-mastersearch', 'so-heavynode', 'so-fleet', 'so-standalone'] %} fbcertdir: file.directory: