[flannel] Do not use {} around FLANNEL_OPTIONS so one can pass more than 1 option
Eric Paris
eparis at fedoraproject.org
Thu Mar 5 19:20:08 UTC 2015
commit b6697a87ec76c84b34b115ba75a717f45a7475a5
Author: Eric Paris <eparis at redhat.com>
Date: Thu Mar 5 14:19:40 2015 -0500
Do not use {} around FLANNEL_OPTIONS so one can pass more than 1 option
flanneld.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/flanneld.service b/flanneld.service
index da6439c..5b64a36 100644
--- a/flanneld.service
+++ b/flanneld.service
@@ -7,7 +7,7 @@ Before=docker.service
Type=notify
EnvironmentFile=/etc/sysconfig/flanneld
EnvironmentFile=-/etc/sysconfig/docker-network
-ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} ${FLANNEL_OPTIONS}
+ExecStart=/usr/bin/flanneld -etcd-endpoints=${FLANNEL_ETCD} -etcd-prefix=${FLANNEL_ETCD_KEY} $FLANNEL_OPTIONS
ExecStartPost=/usr/libexec/flannel/mk-docker-opts.sh -k DOCKER_NETWORK_OPTIONS -d /run/flannel/docker
[Install]
More information about the scm-commits
mailing list