From e46b17044f51a9f02597ced67cf91bbb1b91efef Mon Sep 17 00:00:00 2001
From: Abhishek Shah <abshah@google.com>
Date: Wed, 17 Feb 2016 14:01:20 -0800
Subject: [PATCH] Disable fluent-es on kubernetes-master

---
 cluster/saltbase/salt/fluentd-es/init.sls | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cluster/saltbase/salt/fluentd-es/init.sls b/cluster/saltbase/salt/fluentd-es/init.sls
index 90f19c374b9..0c8c41a67b0 100644
--- a/cluster/saltbase/salt/fluentd-es/init.sls
+++ b/cluster/saltbase/salt/fluentd-es/init.sls
@@ -1,3 +1,4 @@
+{% if grains['roles'][0] != 'kubernetes-master' -%}
 /etc/kubernetes/manifests/fluentd-es.yaml:
   file.managed:
     - source: salt://fluentd-es/fluentd-es.yaml
@@ -6,3 +7,4 @@
     - mode: 644
     - makedirs: true
     - dir_mode: 755
+{% endif %}