From efce770fbb894c23c83b5cc059a36e2728555f5c Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 3 Jul 2015 10:24:32 -0400
Subject: [PATCH] Salt: clean daemon_args on RedHat, not systemd

I don't think it actually makes a difference based on how we're using it,
but this is now more of a precise change.
---
 cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest | 2 +-
 cluster/saltbase/salt/kube-proxy/default                     | 2 +-
 cluster/saltbase/salt/kubelet/default                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
index 34d91da223b..b8d7db0f92e 100644
--- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
+++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
@@ -1,5 +1,5 @@
 {% set daemon_args = "$DAEMON_ARGS" -%}
-{% if pillar.get('is_systemd') -%}
+{% if grains['os_family'] == 'RedHat' -%}
 	{% set daemon_args = "" -%}
 {% endif -%}
 
diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default
index 7d7a9470c37..84d9b7232e3 100644
--- a/cluster/saltbase/salt/kube-proxy/default
+++ b/cluster/saltbase/salt/kube-proxy/default
@@ -1,5 +1,5 @@
 {% set daemon_args = "$DAEMON_ARGS" -%}
-{% if pillar.get('is_systemd') -%}
+{% if grains['os_family'] == 'RedHat' -%}
 	{% set daemon_args = "" -%}
 {% endif -%}
 {# TODO(azure-maintainer): add support for distributing kubeconfig with token to kube-proxy #}
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 7ae38e1284a..40c3d2b9893 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -1,5 +1,5 @@
 {% set daemon_args = "$DAEMON_ARGS" -%}
-{% if pillar.get('is_systemd') -%}
+{% if grains['os_family'] == 'RedHat' -%}
   {% set daemon_args = "" -%}
 {% endif -%}