mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-10-17 18:31:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Set flannel options explicitly

Browse Source 
Setting environment options in a systemd overlay is not getting
honoured; presumably because those options aren't passed through docker
to flanneld. To work around this, pass arguments explicitly, using an
environment file.
This commit is contained in:
Thom May 2014-12-11 16:12:01 +00:00 committed by Thom May
parent 256f852816
commit cd48dfa322
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,8 +16,13 @@ Environment="FLANNEL_VER={{flannel_ver}}"
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStartPre=/usr/bin/mkdir -p /run/flannel ExecStartPre=/usr/bin/mkdir -p /run/flannel
ExecStartPre=/usr/bin/touch /run/flannel/options.env
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock /usr/bin/docker run --net=host --privileged=true --rm -v /run/flannel:/run/flannel -e NOTIFY_SOCKET=/run/flannel/sd.sock quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
/usr/bin/docker run --net=host --privileged=true --rm \
-v /run/flannel:/run/flannel -e NOTIFY_SOCKET=/run/flannel/sd.sock \
--env-file=/run/flannel/options.env \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true
# Update docker options # Update docker options
ExecStartPost=/bin/bash -c ' \ ExecStartPost=/bin/bash -c ' \