[swarm-mode] Remove --live-restore from Docker daemon options
Ensure the --live-restore is not in the Docker daemon OPTIONS.
Some images has this option by default which will cause the node
not being able to perform it swarm init process.
Change-Id: I287a5274143903fad5d4476e9d1640b26bdb46d4
Story: 2004095
Task: 27497
(cherry picked from commit 095b49e6f5
)
This commit is contained in:
parent
6019899a35
commit
46fc9dfd78
|
@ -11,3 +11,8 @@ if [ "$TLS_DISABLED" = 'False' ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed -i '/^OPTIONS=/ s#\(OPTIONS='"'"'\)#\1'"$opts"'#' /etc/sysconfig/docker
|
sed -i '/^OPTIONS=/ s#\(OPTIONS='"'"'\)#\1'"$opts"'#' /etc/sysconfig/docker
|
||||||
|
|
||||||
|
# NOTE(tobias-urdin): The live restore option is only for standalone daemons.
|
||||||
|
# If its specified the swarm init will fail so we remove it here.
|
||||||
|
# See: https://docs.docker.com/config/containers/live-restore
|
||||||
|
sed -i 's/\ --live-restore//g' /etc/sysconfig/docker
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixed a bug where --live-restore was passed to Docker daemon causing the
|
||||||
|
swarm init to fail. Magnum now ensures the --live-restore is not passed
|
||||||
|
to the Docker daemon if it's default in an image.
|
Loading…
Reference in New Issue