From d4553d2b485077edd98865d447df185303b49b19 Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Mon, 2 Mar 2015 18:46:31 -0800 Subject: [PATCH] flannel: add a volume for SSL files Fixes https://github.com/coreos/bugs/issues/291 --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 6 +++++- .../{flannel-0.3.0-r2.ebuild => flannel-0.3.0-r3.ebuild} | 0 2 files changed, 5 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.3.0-r2.ebuild => flannel-0.3.0-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service index 2effa10c03..ce959710ef 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld.service @@ -13,16 +13,20 @@ RestartSec=5 Environment="TMPDIR=/var/tmp/" Environment="DOCKER_HOST=unix:///var/run/early-docker.sock" Environment="FLANNEL_VER={{flannel_ver}}" +Environment="ETCD_SSL_DIR=/etc/ssl/etcd" LimitNOFILE=1048576 LimitNPROC=1048576 ExecStartPre=/sbin/modprobe ip_tables ExecStartPre=/usr/bin/mkdir -p /run/flannel +ExecStartPre=/usr/bin/mkdir -p ${ETCD_SSL_DIR} 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 \ + --volume=/run/flannel:/run/flannel \ + --env=NOTIFY_SOCKET=/run/flannel/sd.sock \ --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 # Update docker options diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r3.ebuild