mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-20 22:11:39 +02:00
flannel: add a volume for SSL files
Fixes https://github.com/coreos/bugs/issues/291
This commit is contained in:
parent
f0e0f463b9
commit
d4553d2b48
@ -13,16 +13,20 @@ RestartSec=5
|
|||||||
Environment="TMPDIR=/var/tmp/"
|
Environment="TMPDIR=/var/tmp/"
|
||||||
Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
|
Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
|
||||||
Environment="FLANNEL_VER={{flannel_ver}}"
|
Environment="FLANNEL_VER={{flannel_ver}}"
|
||||||
|
Environment="ETCD_SSL_DIR=/etc/ssl/etcd"
|
||||||
LimitNOFILE=1048576
|
LimitNOFILE=1048576
|
||||||
LimitNPROC=1048576
|
LimitNPROC=1048576
|
||||||
ExecStartPre=/sbin/modprobe ip_tables
|
ExecStartPre=/sbin/modprobe ip_tables
|
||||||
ExecStartPre=/usr/bin/mkdir -p /run/flannel
|
ExecStartPre=/usr/bin/mkdir -p /run/flannel
|
||||||
|
ExecStartPre=/usr/bin/mkdir -p ${ETCD_SSL_DIR}
|
||||||
ExecStartPre=/usr/bin/touch /run/flannel/options.env
|
ExecStartPre=/usr/bin/touch /run/flannel/options.env
|
||||||
|
|
||||||
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
|
ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
|
||||||
/usr/bin/docker run --net=host --privileged=true --rm \
|
/usr/bin/docker run --net=host --privileged=true --rm \
|
||||||
-v /run/flannel:/run/flannel -e NOTIFY_SOCKET=/run/flannel/sd.sock \
|
--volume=/run/flannel:/run/flannel \
|
||||||
|
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \
|
||||||
--env-file=/run/flannel/options.env \
|
--env-file=/run/flannel/options.env \
|
||||||
|
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
|
||||||
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true
|
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true
|
||||||
|
|
||||||
# Update docker options
|
# Update docker options
|
||||||
|
Loading…
x
Reference in New Issue
Block a user