kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #14071 from mavenugo/mhnet

Browse source 
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
This commit is contained in:
David Calavera 2015-06-22 08:35:18 -07:00
commit f39b9a0b0f
102 changed files with 17526 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

10
daemon/daemon_unix.go
View file

@ -282,6 +282,16 @@ func networkOptions(dconfig *Config) ([]nwconfig.Option, error) {
options = append(options, nwconfig.OptionDefaultDriver(string(dd)))
options = append(options, nwconfig.OptionDefaultNetwork(dn))
}
if strings.TrimSpace(dconfig.NetworkKVStore) != "" {
kv := strings.Split(dconfig.NetworkKVStore, ":")
if len(kv) < 2 {
return nil, fmt.Errorf("kv store daemon config must be of the form KV-PROVIDER:KV-URL")
}
options = append(options, nwconfig.OptionKVProvider(kv[0]))
options = append(options, nwconfig.OptionKVProviderURL(strings.Join(kv[1:], ":")))
}
options = append(options, nwconfig.OptionLabels(dconfig.Labels))
return options, nil
}