From cdd4caf4dff4d8ddfaafa05073a27a33d31e1bae Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 20 Jan 2016 11:23:51 -0500
Subject: [PATCH] Salt: force service provider to systemd if systemd

The version of Salt we're running doesn't do a good job of detecting
systemd.  Inspired by https://github.com/saltstack/salt/issues/13926,
I added a provider-force to the services.

With this change, salt-call -l debug state.highstate succeeds, even for
repeated invocations.

The issue was (probably) benign, but definitely caused noised (e.g. #11297)
---
 cluster/saltbase/salt/kube-addons/init.sls | 4 ++++
 cluster/saltbase/salt/kubelet/init.sls     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls
index 16c5f21da21..7164e572635 100644
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ b/cluster/saltbase/salt/kube-addons/init.sls
@@ -212,3 +212,7 @@ kube-addons:
 {% else %}
       - file: /etc/init.d/kube-addons
 {% endif %}
+{% if pillar.get('is_systemd') %}
+    - provider:
+      - service: systemd
+{%- endif %}
diff --git a/cluster/saltbase/salt/kubelet/init.sls b/cluster/saltbase/salt/kubelet/init.sls
index d37bb558c33..a03bf7a6cb8 100644
--- a/cluster/saltbase/salt/kubelet/init.sls
+++ b/cluster/saltbase/salt/kubelet/init.sls
@@ -79,3 +79,7 @@ kubelet:
 {% endif %}
       - file: {{ environment_file }}
       - file: /var/lib/kubelet/kubeconfig
+{% if pillar.get('is_systemd') %}
+    - provider:
+      - service: systemd
+{%- endif %}