From 1bb1108b910bd03ea6680d5e6d194681fa513426 Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Tue, 9 Feb 2016 16:40:58 +0000
Subject: [PATCH] tiny refactor: use ${CONTAINER_IFNAME} for name construction

---
 weave | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/weave b/weave
index 580c3493..7ef866ca 100755
--- a/weave
+++ b/weave
@@ -348,10 +348,10 @@ CONTAINER_NAME=${WEAVE_CONTAINER_NAME:-weave}
 BRIDGE=weave
 # This value is overridden when the datapath is used unbridged
 DATAPATH=datapath
-BRIDGE_IFNAME=vethwe-bridge
-DATAPATH_IFNAME=vethwe-datapath
-PCAP_IFNAME=vethwe-pcap
 CONTAINER_IFNAME=ethwe
+BRIDGE_IFNAME=v${CONTAINER_IFNAME}-bridge
+DATAPATH_IFNAME=v${CONTAINER_IFNAME}-datapath
+PCAP_IFNAME=v${CONTAINER_IFNAME}-pcap
 PORT=${WEAVE_PORT:-6783}
 HTTP_ADDR=${WEAVE_HTTP_ADDR:-127.0.0.1:6784}
 PROXY_PORT=12375