github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Salt: Add more dependencies to systemd services

Browse Source 
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
This commit is contained in:
Justin Santa Barbara 2015-07-01 06:47:55 -04:00 committed by Tim Hockin
parent a5fa0b8bb5
commit aff1ffc319
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/saltbase/salt/docker/init.sls
View File

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

7
cluster/saltbase/salt/kube-addons/init.sls
View File

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