From 197043a96724ab9e5171b0005a61bbf23cbf1910 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Thu, 30 Jun 2016 13:58:02 -0700 Subject: [PATCH 1/2] flanneld: fix issue with docker options --- .../app-admin/flannel/files/flanneld-rkt.service | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service index 628fcf0a6e..7ff9b1b837 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service @@ -32,6 +32,15 @@ ExecStart=/usr/bin/rkt run --net=host \ ${FLANNEL_IMG}:${FLANNEL_VER} \ -- --ip-masq=true +# Update docker options +ExecStartPost=/usr/bin/rkt run --net=host \ + --stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \ + --insecure-options=image \ + --volume runvol,kind=host,source=/run,readOnly=false \ + --mount volume=runvol,target=/run \ + ${FLANNEL_IMG}:${FLANNEL_VER} \ + --exec /opt/bin/mk-docker-opts.sh -- -d /run/flannel_docker_opts.env -i + ExecStopPost=/usr/bin/rkt gc --mark-only [Install] From b834181f635408a7b3d7f8d2432d2383c3dee1e2 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Fri, 1 Jul 2016 13:55:44 -0700 Subject: [PATCH 2/2] flanneld: add docker as a before in flanneld Ensure flanneld will try to start before docker --- .../coreos-overlay/app-admin/flannel/files/flanneld-rkt.service | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service index 7ff9b1b837..63a6a57139 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service @@ -2,6 +2,7 @@ Description=Network fabric for containers Documentation=https://github.com/coreos/flannel After=etcd.service etcd2.service +Before=docker.service [Service] Type=notify