From ab2e1e5b631a5d2048c962def63ce36ccaca1c38 Mon Sep 17 00:00:00 2001 From: kayrus Date: Mon, 14 Dec 2015 19:06:15 +0100 Subject: [PATCH] Use defined ETCD_SSL_DIR path inside the flannel container --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ebbe766b62..ae019c6a3a 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 @@ -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