kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #26211 from aaronlehmann/no-advertise-addr-detection-on-join 

cluster: Do not autodetect advertise address on join
This commit is contained in:
Tõnis Tiigi 2016-08-31 17:19:23 -07:00 committed by GitHub
parent 5a56f29c64 b1d2b08853
commit beba6ea311
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/cluster/cluster.go
View File

@ -467,11 +467,13 @@ func (c *Cluster) Join(req types.JoinRequest) error {
}
var advertiseAddr string
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
// For joining, we don't need to provide an advertise address,
// since the remote side can detect it.
if err == nil {
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
if req.AdvertiseAddr != "" {
advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
// For joining, we don't need to provide an advertise address,
// since the remote side can detect it.
if err == nil {
advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
}
}
// todo: check current state existing