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

flannel: allow env file path to be overridden

Browse Source
This commit is contained in:
Aaron Levy 2015-09-16 10:41:01 -07:00
parent 45c61c649c
commit 735be85852
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,12 +13,13 @@ 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" Environment="ETCD_SSL_DIR=/etc/ssl/etcd"
Environment="FLANNEL_ENV_FILE=/run/flannel/options.env"
LimitNOFILE=40000 LimitNOFILE=40000
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/mkdir -p ${ETCD_SSL_DIR}
ExecStartPre=/usr/bin/touch /run/flannel/options.env ExecStartPre=-/usr/bin/touch ${FLANNEL_ENV_FILE}
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 \
@ -26,7 +27,7 @@ ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
--env=NOTIFY_SOCKET=/run/flannel/sd.sock \ --env=NOTIFY_SOCKET=/run/flannel/sd.sock \
--env=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --env=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \
--env=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \ --env=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env-file=/run/flannel/options.env \ --env-file=${FLANNEL_ENV_FILE} \
--volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \ --volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \ --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