From dd719a43cea9491cf98aece2e38c68d7a3607aba Mon Sep 17 00:00:00 2001 From: Eugene Yakubovich Date: Wed, 7 Oct 2015 15:11:54 -0700 Subject: [PATCH] flannel: doc fix and check for missing subnet.env fields - Document that flannel outputs FLANNEL_NETWORK b/c we use it - Check and error out if expecited fields are missing in subnetEnv file Fixes #72 --- flannel.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/flannel.md b/flannel.md index e223ddb3..2399ac48 100644 --- a/flannel.md +++ b/flannel.md @@ -4,7 +4,8 @@ This plugin is designed to work in conjunction with [flannel](https://github.com/coreos/flannel), a network fabric for containers. When flannel daemon is started, it outputs a `/run/flannel/subnet.env` file that looks like this: ``` -FLANNEL_SUBNET=10.1.17.0/24 +FLANNEL_NETWORK=10.1.0.0/16 +FLANNEL_SUBNET=10.1.17.1/24 FLANNEL_MTU=1472 FLANNEL_IPMASQ=true ```