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

Merge pull request #1691 from endocode/kayrus/fix_flannel

Browse Source 
Use defined ETCD_SSL_DIR path inside the flannel container
This commit is contained in:
Alex Crawford 2016-01-13 10:22:30 -08:00
commit d0a248ae67
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,7 +29,7 @@ ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \
--env=AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY} \
--env-file=${FLANNEL_ENV_FILE} \
--volume=/usr/share/ca-certificates:/etc/ssl/certs:ro \
--volume=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \
--volume=${ETCD_SSL_DIR}:${ETCD_SSL_DIR}:ro \
quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true
# Update docker options