rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-20 10:03:59 +00:00
Code Issues Releases Wiki Activity

Update rancher/netconf in Godeps

Browse Source
This commit is contained in:
Ivan Mikushin
2015-11-09 23:13:43 +05:00
parent 56b1aa67ac
commit da140193d3
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@@ -368,7 +368,7 @@
}, },
{ {
"ImportPath": "github.com/rancher/netconf", "ImportPath": "github.com/rancher/netconf",
"Rev": "157105e12d6963f6a1c5765540261f6878f0de89" "Rev": "b9aeb623c8ef9551d79efec57ee059658c1ac89c"
}, },
{ {
"ImportPath": "github.com/ryanuber/go-glob", "ImportPath": "github.com/ryanuber/go-glob",

28
Godeps/_workspace/src/github.com/rancher/netconf/netconf.go generated vendored
View File

@@ -42,6 +42,8 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
return err return err
} }
dhcpLinks := []string{}
//apply network config //apply network config
for _, link := range links { for _, link := range links {
linkName := link.Attrs().Name linkName := link.Attrs().Name
@@ -80,13 +82,25 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
} }
if match.Match != "" { if match.Match != "" {
err = applyNetConf(link, match) if match.DHCP {
if err != nil { dhcpLinks = append(dhcpLinks, link.Attrs().Name)
} else if err = applyNetConf(link, match); err != nil {
log.Errorf("Failed to apply settings to %s : %v", linkName, err) log.Errorf("Failed to apply settings to %s : %v", linkName, err)
} }
} }
} }
if len(dhcpLinks) > 0 {
log.Infof("Running DHCP on %v", dhcpLinks)
dhcpcdArgs := append([]string{"-MA4", "-e", "force_hostname=true"}, dhcpLinks...)
cmd := exec.Command("dhcpcd", dhcpcdArgs...)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Error(err)
}
}
if err != nil { if err != nil {
return err return err
} }
@@ -95,15 +109,7 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
} }
func applyNetConf(link netlink.Link, netConf InterfaceConfig) error { func applyNetConf(link netlink.Link, netConf InterfaceConfig) error {
if netConf.DHCP { if netConf.IPV4LL {
log.Infof("Running DHCP on %s", link.Attrs().Name)
cmd := exec.Command("dhcpcd", "-A4", "-e", "force_hostname=true", link.Attrs().Name)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
if err := cmd.Run(); err != nil {
log.Error(err)
}
} else if netConf.IPV4LL {
if err := AssignLinkLocalIP(link); err != nil { if err := AssignLinkLocalIP(link); err != nil {
log.Errorf("IPV4LL set failed: %v", err) log.Errorf("IPV4LL set failed: %v", err)
return err return err