From eff524ba96f413a006cd3764614de58b0c14d8ef Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Mon, 16 Feb 2015 12:41:06 -0800 Subject: [PATCH] flannel: load iptables kmod prior to start flannel execs iptables which will try to load the proper kernel mod if needed but that doesn't work from container. Fixes https://github.com/coreos/bugs/issues/270 --- .../coreos-overlay/app-admin/flannel/files/flanneld.service | 1 + .../flannel/{flannel-0.3.0.ebuild => flannel-0.3.0-r1.ebuild} | 0 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/app-admin/flannel/{flannel-0.3.0.ebuild => flannel-0.3.0-r1.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 0e1dabd6eb..2effa10c03 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 @@ -15,6 +15,7 @@ Environment="DOCKER_HOST=unix:///var/run/early-docker.sock" Environment="FLANNEL_VER={{flannel_ver}}" LimitNOFILE=1048576 LimitNPROC=1048576 +ExecStartPre=/sbin/modprobe ip_tables ExecStartPre=/usr/bin/mkdir -p /run/flannel ExecStartPre=/usr/bin/touch /run/flannel/options.env diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/flannel/flannel-0.3.0-r1.ebuild