Browse Source

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

tags/8.0.0.0rc1
Zuul 7 months ago
parent
commit
63fffda026

+ 5
- 0
magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh View File

@@ -11,3 +11,8 @@ if [ "$TLS_DISABLED" = 'False' ]; then
11 11
 fi
12 12
 
13 13
 sed -i '/^OPTIONS=/ s#\(OPTIONS='"'"'\)#\1'"$opts"'#' /etc/sysconfig/docker
14
+
15
+# NOTE(tobias-urdin): The live restore option is only for standalone daemons.
16
+# If its specified the swarm init will fail so we remove it here.
17
+# See: https://docs.docker.com/config/containers/live-restore
18
+sed -i 's/\ --live-restore//g' /etc/sysconfig/docker

+ 6
- 0
releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml View File

@@ -0,0 +1,6 @@
1
+---
2
+fixes:
3
+  - |
4
+    Fixed a bug where --live-restore was passed to Docker daemon causing the
5
+    swarm init to fail. Magnum now ensures the --live-restore is not passed
6
+    to the Docker daemon if it's default in an image.

Loading…
Cancel
Save