From 735be8585290787205cdc51458d22a9cf76a5890 Mon Sep 17 00:00:00 2001 From: Aaron Levy Date: Wed, 16 Sep 2015 10:41:01 -0700 Subject: [PATCH] flannel: allow env file path to be overridden --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 b8eb21257e..ebbe766b62 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,12 +13,13 @@ 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" +Environment="FLANNEL_ENV_FILE=/run/flannel/options.env" LimitNOFILE=40000 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 +ExecStartPre=-/usr/bin/touch ${FLANNEL_ENV_FILE} ExecStart=/usr/libexec/sdnotify-proxy /run/flannel/sd.sock \ /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=AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID} \ --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=${ETCD_SSL_DIR}:/etc/ssl/etcd:ro \ quay.io/coreos/flannel:${FLANNEL_VER} /opt/bin/flanneld --ip-masq=true