0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1233 from mavenugo/ag

Browse source 
Handle the case of reseting the Cluster Provider for leave caes
This commit is contained in:
Jana Radhakrishnan 2016-06-09 17:02:26 -07:00 • committed by GitHub
commit 5ad7c23e92
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libnetwork/controller.go
View file

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