Merge pull request #2117 from weaveworks/2113-wait-for-dp
wait for datapath device to be ready
This commit is contained in:
commit
b7d49cdeb7
3 files changed
+13
-19
No files matched your search
+3
-1
@@ -348,7 +348,9 @@ func createOverlay(datapathName string, ifaceName string, host string, port int,
|
||||
case datapathName != "" && ifaceName != "":
|
||||
Log.Fatal("At most one of --datapath and --iface must be specified.")
|
||||
case datapathName != "":
|
||||
fastdp, err := weave.NewFastDatapath(datapathName, port)
|
||||
iface, err := weavenet.EnsureInterface(datapathName)
|
||||
checkFatal(err)
|
||||
fastdp, err := weave.NewFastDatapath(iface, port)
|
||||
checkFatal(err)
|
||||
bridge = fastdp.Bridge()
|
||||
overlay.Add("fastdp", fastdp.Overlay())
|
||||
|
||||
Reference in new issue
Block a user