Browse Source

Merge pull request #17245 from dhiltgen/discovery_tls

Wire up libnetwork with TLS discovery options
Phil Estes 9 years ago
parent
commit
94a16c81f4
1 changed files with 3 additions and 0 deletions
  1. 3 0
      daemon/daemon_unix.go

+ 3 - 0
daemon/daemon_unix.go

@@ -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))