rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-08 02:04:13 +00:00
Code Issues Releases Wiki Activity

Call dhcp release on interfaces that are dhcp:false

Browse Source 
and then remove any non-specified IP addresses from them too

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-03-30 12:29:32 +00:00
parent d35e0e05d8
commit ac5cb304d6
3 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/control/install.go
View File

@ -395,7 +395,7 @@ func layDownOS(image, installType, cloudConfig, device, partition, kappend strin
CONSOLE := "tty0" CONSOLE := "tty0"
baseName := "/mnt/new_img" baseName := "/mnt/new_img"
bootDir := "boot/" bootDir := "boot/"
kernelArgs := "rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait printk.devkmsg=on" // console="+CONSOLE kernelArgs := "printk.devkmsg=on rancher.state.dev=LABEL=RANCHER_STATE rancher.state.wait" // console="+CONSOLE
// unmount on trap // unmount on trap
defer util.Unmount(baseName) defer util.Unmount(baseName)
@ -1027,6 +1027,7 @@ func installRancher(baseName, bootDir, VERSION, DIST, kappend string) (string, e
} }
} }
os.Rename(currentCfg, previousCfg) os.Rename(currentCfg, previousCfg)
// TODO: now that we're parsing syslinux.cfg files, maybe we can delete old kernels and initrds
} }
// The image/ISO have all the files in it - the syslinux cfg's and the kernel&initrd, so we can copy them all from there // The image/ISO have all the files in it - the syslinux cfg's and the kernel&initrd, so we can copy them all from there
@ -1039,7 +1040,6 @@ func installRancher(baseName, bootDir, VERSION, DIST, kappend string) (string, e
log.Errorf("copy %s: %s", file.Name(), err) log.Errorf("copy %s: %s", file.Name(), err)
//return err //return err
} }
log.Debugf("copied %s to %s as %s", filepath.Join(DIST, file.Name()), filepath.Join(baseName, bootDir), file.Name())
} }
// the general INCLUDE syslinuxcfg // the general INCLUDE syslinuxcfg
if err := dfs.CopyFile(filepath.Join(DIST, "isolinux", "isolinux.cfg"), filepath.Join(baseName, bootDir, "syslinux"), "syslinux.cfg"); err != nil { if err := dfs.CopyFile(filepath.Join(DIST, "isolinux", "isolinux.cfg"), filepath.Join(baseName, bootDir, "syslinux"), "syslinux.cfg"); err != nil {

2
cmd/network/network.go
View File

@ -43,10 +43,12 @@ func ApplyNetworkConfig(cfg *config.CloudConfig) {
// TODO: seems wrong to do this outside netconf // TODO: seems wrong to do this outside netconf
userSetHostname := cfg.Hostname != "" userSetHostname := cfg.Hostname != ""
log.Infof("Apply Network Config RunDhcp")
if err := netconf.RunDhcp(&cfg.Rancher.Network, !userSetHostname, !userSetDNS); err != nil { if err := netconf.RunDhcp(&cfg.Rancher.Network, !userSetHostname, !userSetDNS); err != nil {
log.Error(err) log.Error(err)
} }
log.Infof("Apply Network Config SyncHostname")
if err := hostname.SyncHostname(); err != nil { if err := hostname.SyncHostname(); err != nil {
log.Error(err) log.Error(err)
} }

35
netconf/netconf_linux.go
View File

@ -24,6 +24,7 @@ const (
var ( var (
defaultDhcpArgs = []string{"dhcpcd", "-MA4"} defaultDhcpArgs = []string{"dhcpcd", "-MA4"}
dhcpReleaseCmd = "dhcpcd --release"
) )
func createInterfaces(netCfg *NetworkConfig) { func createInterfaces(netCfg *NetworkConfig) {
@ -186,10 +187,12 @@ func ApplyNetworkConfigs(netCfg *NetworkConfig) error {
} }
func RunDhcp(netCfg *NetworkConfig, setHostname, setDNS bool) error { func RunDhcp(netCfg *NetworkConfig, setHostname, setDNS bool) error {
log.Debugf("RunDhcp")
populateDefault(netCfg) populateDefault(netCfg)
links, err := netlink.LinkList() links, err := netlink.LinkList()
if err != nil { if err != nil {
log.Errorf("RunDhcp failed to get LinkList, %s", err)
return err return err
} }
@ -197,21 +200,26 @@ func RunDhcp(netCfg *NetworkConfig, setHostname, setDNS bool) error {
for _, link := range links { for _, link := range links {
name := link.Attrs().Name name := link.Attrs().Name
args := "" if name == "lo" {
if match, ok := findMatch(link, netCfg); ok && match.DHCP { continue
args = match.DHCPArgs }
} else { match, ok := findMatch(link, netCfg)
args = "dhcpd --release" if !ok {
continue
} }
wg.Add(1) wg.Add(1)
go func(iface, args string) { go func(iface string, match InterfaceConfig) {
runDhcp(netCfg, iface, args, setHostname, setDNS) if match.DHCP {
runDhcp(netCfg, iface, match.DHCPArgs, setHostname, setDNS)
} else {
runDhcp(netCfg, iface, dhcpReleaseCmd, false, true)
}
wg.Done() wg.Done()
}(name, args) }(name, match)
} }
wg.Wait() wg.Wait()
return err return nil
} }
func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, setDNS bool) { func runDhcp(netCfg *NetworkConfig, iface string, argstr string, setHostname, setDNS bool) {
@ -387,8 +395,13 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
} }
for _, addr := range existingAddrs { for _, addr := range existingAddrs {
if _, ok := addrMap[addr.IPNet.String()]; !ok { if _, ok := addrMap[addr.IPNet.String()]; !ok {
log.Infof("leaving %s from %s", addr.String(), link.Attrs().Name) if netConf.DHCP {
//removeAddress(addr, link) // let the dhcpcd take care of it
log.Infof("leaving %s from %s", addr.String(), link.Attrs().Name)
} else {
log.Infof("removing %s from %s", addr.String(), link.Attrs().Name)
removeAddress(addr, link)
}
} }
} }