mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-12-07 10:22:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2040 from ajeddeloh/rkt-flannel-fix

Browse Source 
flanneld: fix issue with docker options
This commit is contained in:
Alex Crawford 2016-07-01 17:40:51 -07:00 committed by GitHub
commit 390bbf24d7
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service vendored
View File

@ -2,6 +2,7 @@
Description=Network fabric for containers Description=Network fabric for containers
Documentation=https://github.com/coreos/flannel Documentation=https://github.com/coreos/flannel
After=etcd.service etcd2.service After=etcd.service etcd2.service
Before=docker.service
[Service] [Service]
Type=notify Type=notify
@ -32,6 +33,15 @@ ExecStart=/usr/bin/rkt run --net=host \
${FLANNEL_IMG}:${FLANNEL_VER} \ ${FLANNEL_IMG}:${FLANNEL_VER} \
-- --ip-masq=true -- --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 ExecStopPost=/usr/bin/rkt gc --mark-only
[Install] [Install]