From 6c15c817e31fbe431a27a1eecfa6f16ebb4c8bb8 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Tue, 5 Jul 2016 13:19:30 -0700 Subject: [PATCH] flannel: fix ipmasq issue Fix issue where --ip-masq=true is passed to sh instead of flanneld. --- .../coreos-overlay/app-admin/flannel/files/flanneld-rkt.service | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service index 3424453674..c47a87aed6 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/files/flanneld-rkt.service @@ -35,6 +35,7 @@ ExecStart=/usr/bin/rkt run --net=host \ --mount volume=certs,target=/etc/ssl/certs \ --mount volume=resolv,target=/etc/resolv.conf \ ${FLANNEL_IMG}:${FLANNEL_VER} \ + --exec /opt/bin/flanneld \ -- --ip-masq=true # Update docker options