mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-24 16:01:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Flannel: fix various issues
This commit is contained in:
Andrew Jeddeloh 2016-07-06 14:01:11 -07:00 committed by GitHub
commit 83ce8c045a
1 changed files with 5 additions and 0 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-rkt.service vendored
View File

@ -27,10 +27,15 @@ ExecStart=/usr/bin/rkt run --net=host \
--volume runsystemd,kind=host,source=/run/systemd,readOnly=false \ --volume runsystemd,kind=host,source=/run/systemd,readOnly=false \
--volume runflannel,kind=host,source=/run/flannel,readOnly=false \ --volume runflannel,kind=host,source=/run/flannel,readOnly=false \
--volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \ --volume ssl,kind=host,source=${ETCD_SSL_DIR},readOnly=true \
--volume certs,kind=host,source=/usr/share/ca-certificates,readOnly=true \
--volume resolv,kind=host,source=/etc/resolv.conf,readOnly=true \
--mount volume=runsystemd,target=/run/systemd \ --mount volume=runsystemd,target=/run/systemd \
--mount volume=runflannel,target=/run/flannel \ --mount volume=runflannel,target=/run/flannel \
--mount volume=ssl,target=${ETCD_SSL_DIR} \ --mount volume=ssl,target=${ETCD_SSL_DIR} \
--mount volume=certs,target=/etc/ssl/certs \
--mount volume=resolv,target=/etc/resolv.conf \
${FLANNEL_IMG}:${FLANNEL_VER} \ ${FLANNEL_IMG}:${FLANNEL_VER} \
--exec /opt/bin/flanneld \
-- --ip-masq=true -- --ip-masq=true
# Update docker options # Update docker options