p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17245 from dhiltgen/discovery_tls

Browse Source 
Wire up libnetwork with TLS discovery options
Upstream-commit: 94a16c81f4b6f44c8ffd8974f71c2975d524d32a
Component: engine
This commit is contained in:
Phil Estes
2015-10-21 15:20:24 -04:00
parent 64dbd1e1a8 53531be5ba
commit 6f2afc4020
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/engine/daemon/daemon_unix.go
View File

@ -341,6 +341,9 @@ func (daemon *Daemon) networkOptions(dconfig *Config) ([]nwconfig.Option, error)
options = append(options, nwconfig.OptionKVProvider(kv[0]))
options = append(options, nwconfig.OptionKVProviderURL(strings.Join(kv[1:], "://")))
}
if len(dconfig.ClusterOpts) > 0 {
options = append(options, nwconfig.OptionKVOpts(dconfig.ClusterOpts))
}
if daemon.discoveryWatcher != nil {
options = append(options, nwconfig.OptionDiscoveryWatcher(daemon.discoveryWatcher))