Dockerd won't start if a network with the default subnet prefix already exists in HNS.
Signed-off-by: Pradip Dhara <pradipd@microsoft.com>
This commit is contained in:
parent
c36460c437
commit
89c6febfc2
|
@ -33,7 +33,6 @@ import (
|
||||||
|
|
||||||
const (
|
const (
|
||||||
isWindows = true
|
isWindows = true
|
||||||
defaultNetworkSpace = "172.16.0.0/12"
|
|
||||||
platformSupported = true
|
platformSupported = true
|
||||||
windowsMinCPUShares = 1
|
windowsMinCPUShares = 1
|
||||||
windowsMaxCPUShares = 10000
|
windowsMaxCPUShares = 10000
|
||||||
|
@ -424,15 +423,19 @@ func initBridgeDriver(controller libnetwork.NetworkController, config *config.Co
|
||||||
winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(),
|
winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(),
|
||||||
}
|
}
|
||||||
|
|
||||||
subnetPrefix := defaultNetworkSpace
|
var ipamOption libnetwork.NetworkOption
|
||||||
|
var subnetPrefix string
|
||||||
|
|
||||||
if config.BridgeConfig.FixedCIDR != "" {
|
if config.BridgeConfig.FixedCIDR != "" {
|
||||||
subnetPrefix = config.BridgeConfig.FixedCIDR
|
subnetPrefix = config.BridgeConfig.FixedCIDR
|
||||||
}
|
}
|
||||||
|
|
||||||
ipamV4Conf := libnetwork.IpamConf{PreferredPool: subnetPrefix}
|
if subnetPrefix != "" {
|
||||||
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
|
ipamV4Conf := libnetwork.IpamConf{PreferredPool: subnetPrefix}
|
||||||
v6Conf := []*libnetwork.IpamConf{}
|
v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
|
||||||
ipamOption := libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
|
v6Conf := []*libnetwork.IpamConf{}
|
||||||
|
ipamOption = libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
|
||||||
|
}
|
||||||
|
|
||||||
_, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "",
|
_, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "",
|
||||||
libnetwork.NetworkOptionGeneric(options.Generic{
|
libnetwork.NetworkOptionGeneric(options.Generic{
|
||||||
|
|
Loading…
Reference in New Issue