C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1174 from jlothian/atomic-docker-restart

Browse source 
Fix docker restart in atomic
This commit is contained in:
Brad Beam 2017-06-07 12:05:32 -05:00 committed by GitHub
commit 780308c194
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roles/network_plugin/flannel/handlers/main.yml
View file

@ -4,11 +4,16 @@
failed_when: false failed_when: false
notify: Flannel | restart docker notify: Flannel | restart docker
# special cases for atomic because it defaults to live-restore: true
# So we disable live-restore to pickup the new flannel IP. After
# we enable it, we have to restart docker again to pickup the new
# setting and restore the original behavior
- name: Flannel | restart docker - name: Flannel | restart docker
command: /bin/true command: /bin/true
notify: notify:
- Flannel | reload systemd - Flannel | reload systemd
- Flannel | reload docker.socket - Flannel | reload docker.socket
- Flannel | configure docker live-restore true (atomic)
- Flannel | reload docker - Flannel | reload docker
- Flannel | pause while Docker restarts - Flannel | pause while Docker restarts
- Flannel | wait for docker - Flannel | wait for docker
@ -22,6 +27,13 @@
state: restarted state: restarted
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS'] when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
- name: Flannel | configure docker live-restore true (atomic)
replace:
name: /etc/docker/daemon.json
regexp: '"live-restore":.*true'
replace: '"live-restore": false'
when: is_atomic
- name: Flannel | reload docker - name: Flannel | reload docker
service: service:
name: docker name: docker