From 316a652e6ee0e96b07d2c1702ff2f42410ed97d0 Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Mon, 19 Oct 2015 02:35:54 -0700 Subject: [PATCH] Fixes #680 Signed-off-by: Santhosh Manohar --- libnetwork/drivers/overlay/ov_network.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libnetwork/drivers/overlay/ov_network.go b/libnetwork/drivers/overlay/ov_network.go index d09fd56975..e67757b4f0 100644 --- a/libnetwork/drivers/overlay/ov_network.go +++ b/libnetwork/drivers/overlay/ov_network.go @@ -179,6 +179,7 @@ func (n *network) destroySandbox() { } } sbox.Destroy() + n.setSandbox(nil) } } @@ -193,7 +194,7 @@ func (n *network) initSubnetSandbox(s *subnet) error { if err := sbox.AddInterface(brName, "br", sbox.InterfaceOptions().Address(s.gwIP), sbox.InterfaceOptions().Bridge(true)); err != nil { - return fmt.Errorf("bridge creation in sandbox failed for subnet %q: %v", s.subnetIP.IP.String(), err) + return fmt.Errorf("bridge creation in sandbox failed for subnet %q: %v", s.subnetIP.String(), err) } vxlanName, err := createVxlan(n.vxlanID(s)) @@ -203,7 +204,7 @@ func (n *network) initSubnetSandbox(s *subnet) error { if err := sbox.AddInterface(vxlanName, "vxlan", sbox.InterfaceOptions().Master(brName)); err != nil { - return fmt.Errorf("vxlan interface creation failed for subnet %q: %v", s.subnetIP.IP.String(), err) + return fmt.Errorf("vxlan interface creation failed for subnet %q: %v", s.subnetIP.String(), err) } n.Lock()