summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Urdin <tobias.urdin@binero.se>2018-10-16 19:09:38 +0200
committerTobias Urdin <tobias.urdin@binero.se>2018-10-19 10:48:44 +0000
commit46fc9dfd780c22c43326b1d2518cddc002a9a1fb (patch)
treee4ea2276d5e79fe3ecf0d004c318a7d81358642e
parent6019899a359e3a50ec5b66136057f15968d10974 (diff)
[swarm-mode] Remove --live-restore from Docker daemon optionsstable/ocata
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 095b49e6f532f961854d8e0363e0f4aae01d189f)
Notes
Notes (review): Code-Review+2: Spyros Trigazis <strigazi@gmail.com> Code-Review+1: Erik Olof Gunnar Andersson <eandersson@blizzard.com> Code-Review+1: Colin Gibbons <cgibbons@blizzard.com> Workflow+1: Spyros Trigazis <strigazi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 24 Oct 2018 21:26:07 +0000 Reviewed-on: https://review.openstack.org/611839 Project: openstack/magnum Branch: refs/heads/stable/ocata
-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.