From 77904359153540151f40a78e79cb7396c4b5bbd9 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 4 Feb 2015 13:21:08 -0500
Subject: [PATCH] Fix for bool vs string comparisons in salt templates

Fixes #4118
---
 cluster/saltbase/salt/kubelet/default | 2 +-
 cluster/saltbase/salt/top.sls         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 3192f8b33ae..2c921b4042f 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -29,7 +29,7 @@
 
 {% set cluster_dns = "" %}
 {% set cluster_domain = "" %}
-{% if pillar['enable_cluster_dns'] is defined and pillar['enable_cluster_dns'] %}
+{% if pillar.get('enable_cluster_dns', '').lower() == 'true' %}
   {% set cluster_dns = "--cluster_dns=" + pillar['dns_server'] %}
   {% set cluster_domain = "--cluster_domain=" + pillar['dns_domain'] %}
 {% endif %}
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index e9139d17d51..3a34d349072 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -8,10 +8,10 @@ base:
     - docker
     - kubelet
     - kube-proxy
-{% if pillar['enable_node_monitoring'] is defined and pillar['enable_node_monitoring'] %}
+{% if pillar.get('enable_node_monitoring', '').lower() == 'true' %}
     - cadvisor
 {% endif %}
-{% if pillar['enable_node_logging'] is defined and pillar['enable_node_logging'] %}
+{% if pillar.get('enable_node_logging', '').lower() == 'true' %}
   {% if pillar['logging_destination'] is defined and pillar['logging_destination'] == 'elasticsearch' %}
     - fluentd-es
   {% endif %}