From 191528b782c918c6ec6ba5aebeb1f574d478444f Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Fri, 3 Jul 2015 10:26:21 -0400
Subject: [PATCH] Salt: Add service block for kube-proxy for systemd

We have the workaround for Salt's problems here, but we should still express
our intent.
---
 cluster/saltbase/salt/kube-proxy/init.sls | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cluster/saltbase/salt/kube-proxy/init.sls b/cluster/saltbase/salt/kube-proxy/init.sls
index 7dabce92a2e..3761b5bbce5 100644
--- a/cluster/saltbase/salt/kube-proxy/init.sls
+++ b/cluster/saltbase/salt/kube-proxy/init.sls
@@ -53,16 +53,20 @@ kube-proxy:
     - group: root
     - mode: 755
 
+{% endif %}
+
 kube-proxy-service:
   service.running:
     - name: kube-proxy
     - enable: True
     - watch:
       - file: {{ environment_file }}
+{% if pillar.get('is_systemd') %}
+      - file: {{ pillar.get('systemd_system_path') }}/kube-proxy.service
+{% else %}
       - file: /etc/init.d/kube-proxy
-      - file: /var/lib/kube-proxy/kubeconfig
-
 {% endif %}
+      - file: /var/lib/kube-proxy/kubeconfig
 
 /var/lib/kube-proxy/kubeconfig:
   file.managed: