Merge pull request #1236 from docker/revert-1233-ag

Revert "Handle the case of reseting the Cluster Provider for leave caes"

libnetwork/controller.go

@@ -218,10 +218,8 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {
 
 func (c *controller) SetClusterProvider(provider cluster.Provider) {
 	c.cfg.Daemon.ClusterProvider = provider
-	if provider != nil {
 	go c.clusterAgentInit()
 }
-}
 
 func isValidClusteringIP(addr string) bool {
 	return addr != "" && !net.ParseIP(addr).IsLoopback() && !net.ParseIP(addr).IsUnspecified()
@@ -263,7 +261,6 @@ func (c *controller) clusterAgentInit() {
 			} else {
 				c.agentInitDone = make(chan struct{})
 				c.agentClose()
-				return
 			}
 		}
 	}