Merge pull request #1790 from weaveworks/1783-veth-name

Prefix interface names with 'veth' so NetworkManager ignores them
2015-12-16 10:34:32 +00:00
commit ce90d2389b
@@ -345,8 +345,8 @@ CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
 BRIDGE=weave
 # This value is overridden when the datapath is used unbridged
 DATAPATH=datapath
-BRIDGE_IFNAME=link-${BRIDGE}
-DATAPATH_IFNAME=${DATAPATH}-link
+BRIDGE_IFNAME=vethwe-bridge
+DATAPATH_IFNAME=vethwe-datapath
 CONTAINER_IFNAME=ethwe
 PORT=${WEAVE_PORT:-6783}
 HTTP_PORT=6784