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

Salt: Add more dependencies to systemd services
aff1ffc3 · Justin Santa Barbara · Tim Hockin · a5fa0b8b · aff1ffc3 · aff1ffc3
Commit aff1ffc3 authored Jul 01, 2015 by Justin Santa Barbara Committed by Tim Hockin Jul 08, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

init.sls cluster/saltbase/salt/docker/init.sls +3 -0

init.sls cluster/saltbase/salt/kube-addons/init.sls +6 -1

No files found.
--- 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 }}

--- 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 %}