summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-19 10:30:06 +0000
committerGerrit Code Review <review@openstack.org>2018-10-19 10:30:06 +0000
commit63fffda0263bf22d4b971fe87f72314bac182728 (patch)
tree83f84f302f12b5e6df5edea4ce1fa8cbfb708781
parent48e2e77406b16019d5e2273c0f563e37f204c482 (diff)
parent095b49e6f532f961854d8e0363e0f4aae01d189f (diff)
Merge "[swarm-mode] Remove --live-restore from Docker daemon options"
-rw-r--r--magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh5
-rw-r--r--releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml6
2 files changed, 11 insertions, 0 deletions
diff --git a/magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh b/magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh
index b08eb31..b5f7393 100644
--- a/magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh
+++ b/magnum/drivers/common/templates/swarm/fragments/add-docker-daemon-options.sh
@@ -11,3 +11,8 @@ if [ "$TLS_DISABLED" = 'False' ]; then
11fi 11fi
12 12
13sed -i '/^OPTIONS=/ s#\(OPTIONS='"'"'\)#\1'"$opts"'#' /etc/sysconfig/docker 13sed -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
18sed -i 's/\ --live-restore//g' /etc/sysconfig/docker
diff --git a/releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml b/releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml
new file mode 100644
index 0000000..05fbd32
--- /dev/null
+++ b/releasenotes/notes/swarm-live-restore-b03ad192367abced.yaml
@@ -0,0 +1,6 @@
1---
2fixes:
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.