Merge pull request #1105 from eyakubovich/master

flannel: load iptables kmod prior to start
This commit is contained in:
Eugene Yakubovich 2015-02-16 13:47:49 -08:00
commit 889920f116
2 changed files with 1 additions and 0 deletions

View File

@ -15,6 +15,7 @@ Environment="DOCKER_HOST=unix:///var/run/early-docker.sock"
Environment="FLANNEL_VER={{flannel_ver}}" Environment="FLANNEL_VER={{flannel_ver}}"
LimitNOFILE=1048576 LimitNOFILE=1048576
LimitNPROC=1048576 LimitNPROC=1048576
ExecStartPre=/sbin/modprobe ip_tables
ExecStartPre=/usr/bin/mkdir -p /run/flannel ExecStartPre=/usr/bin/mkdir -p /run/flannel
ExecStartPre=/usr/bin/touch /run/flannel/options.env ExecStartPre=/usr/bin/touch /run/flannel/options.env