From aff1ffc3198e35a9f4c9de5fe71f8fa785f86f73 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 1 Jul 2015 06:47:55 -0400
Subject: [PATCH] Salt: Add more dependencies to systemd services

This may help Salt reload services correctly, although we still
need the script until Salt's bug with reloading services on systemd
is resolved.

Salt bug: https://github.com/saltstack/salt/issues/16778
---
 cluster/saltbase/salt/docker/init.sls      | 3 +++
 cluster/saltbase/salt/kube-addons/init.sls | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/docker/init.sls b/cluster/saltbase/salt/docker/init.sls
index be9e0558380..905c8deae79 100644
--- a/cluster/saltbase/salt/docker/init.sls
+++ b/cluster/saltbase/salt/docker/init.sls
@@ -159,6 +159,9 @@ docker:
 {% endif %}
     - watch:
       - file: {{ environment_file }}
+{% if pillar.get('is_systemd') %}
+      - file: {{ pillar.get('systemd_system_path') }}/docker.service
+{% endif %}
 {% if override_docker_ver != '' %}
     - require:
       - pkg: lxc-docker-{{ override_docker_ver }}
diff --git a/cluster/saltbase/salt/kube-addons/init.sls b/cluster/saltbase/salt/kube-addons/init.sls
index 46cba18b029..40205ef87f1 100644
--- a/cluster/saltbase/salt/kube-addons/init.sls
+++ b/cluster/saltbase/salt/kube-addons/init.sls
@@ -140,6 +140,8 @@ addon-dir-create:
     - group: root
     - mode: 755
 
+{% endif %}
+
 # Stop kube-addons service each time salt is executed, just in case
 # there was a modification of addons.
 # Actually, this should be handled by watching file changes, but
@@ -153,5 +155,8 @@ kube-addons:
     - enable: True
     - require:
         - service: service-kube-addon-stop
-
+    - watch:
+{% if pillar.get('is_systemd') %}
+      - file: {{ pillar.get('systemd_system_path') }}/kube-addons.service
 {% endif %}
+