flannel: doc fix and check for missing subnet.env fields
authorEugene Yakubovich <eugene.yakubovich@coreos.com>
Wed, 7 Oct 2015 22:11:54 +0000 (15:11 -0700)
committerEugene Yakubovich <eugene.yakubovich@coreos.com>
Wed, 7 Oct 2015 22:38:12 +0000 (15:38 -0700)
- 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

index e223ddb..2399ac4 100644 (file)
@@ -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
 ```