Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
780308c1
Commit
780308c1
authored
7 years ago
by
Brad Beam
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #1174 from jlothian/atomic-docker-restart
Fix docker restart in atomic
parents
696fd690
7ae57854
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/network_plugin/flannel/handlers/main.yml
+12
-0
12 additions, 0 deletions
roles/network_plugin/flannel/handlers/main.yml
with
12 additions
and
0 deletions
roles/network_plugin/flannel/handlers/main.yml
+
12
−
0
View file @
780308c1
...
...
@@ -4,11 +4,16 @@
failed_when
:
false
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
command
:
/bin/true
notify
:
-
Flannel | reload systemd
-
Flannel | reload docker.socket
-
Flannel | configure docker live-restore
true
(atomic)
-
Flannel | reload docker
-
Flannel | pause while Docker restarts
-
Flannel | wait for docker
...
...
@@ -22,6 +27,13 @@
state
:
restarted
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
service
:
name
:
docker
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment