From ad090311e12be5675a9c23e95f5b2c348ce8822f Mon Sep 17 00:00:00 2001
From: John Arbash Meinel <john@arbash-meinel.com>
Date: Wed, 21 Dec 2016 21:38:03 +0400
Subject: [PATCH] fix the broker code that I didn't fully revert.

---
 worker/provisioner/broker.go      | 2 +-
 worker/provisioner/broker_test.go | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/worker/provisioner/broker.go b/worker/provisioner/broker.go
index bab7620811a..772cbe084a6 100644
--- a/worker/provisioner/broker.go
+++ b/worker/provisioner/broker.go
@@ -63,7 +63,7 @@ func prepareOrGetContainerInterfaceInfo(
 	if err != nil {
 		return nil, errors.Trace(err)
 	}
-	log.Tracef("PrepareContainerInterfaceInfo returned %+v %+v", preparedInfo, devicesToBridge)
+	log.Tracef("PrepareContainerInterfaceInfo returned %+v", preparedInfo)
 
 	return preparedInfo, nil
 }
diff --git a/worker/provisioner/broker_test.go b/worker/provisioner/broker_test.go
index 8cfd04174ef..81686610850 100644
--- a/worker/provisioner/broker_test.go
+++ b/worker/provisioner/broker_test.go
@@ -87,12 +87,12 @@ func (f *fakeAPI) ContainerConfig() (params.ContainerConfig, error) {
 	return f.fakeContainerConfig, nil
 }
 
-func (f *fakeAPI) PrepareContainerInterfaceInfo(tag names.MachineTag) ([]network.InterfaceInfo, []network.DeviceToBridge, error) {
+func (f *fakeAPI) PrepareContainerInterfaceInfo(tag names.MachineTag) ([]network.InterfaceInfo, error) {
 	f.MethodCall(f, "PrepareContainerInterfaceInfo", tag)
 	if err := f.NextErr(); err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	return []network.InterfaceInfo{f.fakeInterfaceInfo}, nil, nil
+	return []network.InterfaceInfo{f.fakeInterfaceInfo}, nil
 }
 
 func (f *fakeAPI) GetContainerInterfaceInfo(tag names.MachineTag) ([]network.InterfaceInfo, error) {