From 92cc176b6d8ae0a7302486ac1a42cbda586ec05b Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 10 Aug 2020 20:59:41 -0400
Subject: [PATCH] Fix features logic in all states that use it

---
 salt/elasticsearch/init.sls | 2 +-
 salt/filebeat/init.sls      | 2 +-
 salt/kibana/init.sls        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/salt/elasticsearch/init.sls b/salt/elasticsearch/init.sls
index 5f87a430c..2a675cc45 100644
--- a/salt/elasticsearch/init.sls
+++ b/salt/elasticsearch/init.sls
@@ -17,7 +17,7 @@
 {% set MANAGER = salt['grains.get']('master') %}
 {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
 
-{% if FEATURES %}
+{%- if FEATURES is sameas true %}
   {% set FEATURES = "-features" %}
 {% else %}
   {% set FEATURES = '' %}
diff --git a/salt/filebeat/init.sls b/salt/filebeat/init.sls
index a4fa36b14..ee7c5ae10 100644
--- a/salt/filebeat/init.sls
+++ b/salt/filebeat/init.sls
@@ -16,7 +16,7 @@
 {% set MANAGER = salt['grains.get']('master') %}
 {% set MANAGERIP = salt['pillar.get']('global:managerip', '') %}
 {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
-{% if FEATURES %}
+{%- if FEATURES is sameas true %}
   {% set FEATURES = "-features" %}
 {% else %}
   {% set FEATURES = '' %}
diff --git a/salt/kibana/init.sls b/salt/kibana/init.sls
index a1dccd137..8711d47d1 100644
--- a/salt/kibana/init.sls
+++ b/salt/kibana/init.sls
@@ -2,7 +2,7 @@
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
 {% set MANAGER = salt['grains.get']('master') %}
 {% set FEATURES = salt['pillar.get']('elastic:features', False) %}
-{% if FEATURES %}
+{%- if FEATURES is sameas true %}
   {% set FEATURES = "-features" %}
 {% else %}
   {% set FEATURES = '' %}