Fix docker restart in atomic
In atomic, containers are left running when docker is restarted. When docker is restarted after the flannel config is put in place, the docker0 interface isn't re-IPed because docker sees the running containers and won't update the previous config. This patch kills all the running containers after docker is stopped. We can't simply `docker stop` the running containers, as they respawn before we've got a chance to stop the docker daemon, so we need to use runc to do this after dockerd is stopped.
This commit is contained in:
parent
06057ed921
commit
806f12804b
1 changed files with 6 additions and 0 deletions
|
@ -10,6 +10,7 @@
|
|||
- Flannel | reload systemd
|
||||
- Flannel | reload docker.socket
|
||||
- Flannel | reload docker
|
||||
- Flannel | reload docker (atomic)
|
||||
- Flannel | pause while Docker restarts
|
||||
- Flannel | wait for docker
|
||||
|
||||
|
@ -26,6 +27,11 @@
|
|||
service:
|
||||
name: docker
|
||||
state: restarted
|
||||
when: not is_atomic
|
||||
|
||||
- name: Flannel | reload docker (atomic)
|
||||
shell: systemctl stop docker && runc list | awk '!/ID/ {print $1}' | xargs -n 1 -I ID runc kill ID KILL && systemctl start docker
|
||||
when: is_atomic
|
||||
|
||||
- name: Flannel | pause while Docker restarts
|
||||
pause:
|
||||
|
|
Loading…
Reference in a new issue