Merge "[swarm-mode] Remove --live-restore from Docker daemon options"

changes/01/612301/1
Zuul 4 years ago committed by Gerrit Code Review
commit 63fffda026
  1. 5
      magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh
  2. 6
      releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml

@ -11,3 +11,8 @@ if [ "$TLS_DISABLED" = 'False' ]; then
fi
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…
Cancel
Save