Merge pull request #918 from joshwget/bump-netconf

Bump netconf

trash.yml

@@ -70,7 +70,7 @@ import:
   version: v1.10.3
 
 - package: github.com/rancher/netconf
-  version: 7880fdeac0923a05b86a0b5774b4dc96a5749d76
+  version: 43bd602971bfed4d41cdcc1ef9cffa204ad28c3f
 
 - package: github.com/ryanuber/go-glob
   version: 0067a9abd927e50aed5190662702f81231413ae0

vendor/github.com/rancher/netconf/netconf_linux.go

@@ -183,6 +183,8 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
 }
 
 func RunDhcp(netCfg *NetworkConfig, setHostname, setDns bool) error {
+	populateDefault(netCfg)
+
 	links, err := netlink.LinkList()
 	if err != nil {
 		return err
@@ -360,7 +362,7 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
 	}
 
 	if err := setGateway(netConf.GatewayIpv6); err != nil {
-		log.Errorf("Fail to set gateway %s", netConf.Gateway)
+		log.Errorf("Fail to set gateway %s", netConf.GatewayIpv6)
 	}
 
 	runCmds(netConf.PostUp, link.Attrs().Name)

vendor/github.com/rancher/netconf/types.go

@@ -5,6 +5,9 @@ type NetworkConfig struct {
 	Dns        DnsConfig                  `yaml:"dns,omitempty"`
 	Interfaces map[string]InterfaceConfig `yaml:"interfaces,omitempty"`
 	PostCmds   []string                   `yaml:"post_cmds,omitempty"`
+	HttpProxy  string                     `yaml:"http_proxy,omitempty"`
+	HttpsProxy string                     `yaml:"https_proxy,omitempty"`
+	NoProxy    string                     `yaml:"no_proxy,omitempty"`
 }
 
 type InterfaceConfig struct {