Merge branch '1.8'

Fixes #2669.
weaveworks · Nov 28, 2016 · e61ddc5 · e61ddc5
2 parents 9cff5f2 + 46e4f04
commit e61ddc5
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/prog/weave-kube/launch.sh b/prog/weave-kube/launch.sh
@@ -7,6 +7,9 @@ IPALLOC_RANGE=${IPALLOC_RANGE:-10.32.0.0/12}
 HTTP_ADDR=${WEAVE_HTTP_ADDR:-127.0.0.1:6784}
 STATUS_ADDR=${WEAVE_STATUS_ADDR:-0.0.0.0:6782}
 
+# Check if the IP range overlaps anything existing on the host
+/usr/bin/weaveutil netcheck $IPALLOC_RANGE weave
+
 # Default for network policy
 EXPECT_NPC=${EXPECT_NPC:-1}