rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-01 06:40:31 +00:00
Code Issues Releases Wiki Activity

Don't make IPv4LL and Addresses mutally exclusive

Browse Source
This commit is contained in:
Darren Shepherd
2017-03-08 15:57:58 -07:00
committed by Sven Dowideit
parent b5fdd63a85
commit e4c2271c6b
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
netconf/netconf_linux.go
View File

@@ -325,22 +325,22 @@ func applyInterfaceConfig(link netlink.Link, netConf InterfaceConfig) error {
log.Errorf("IPV4LL set failed: %v", err)
return err
}
} else {
addresses := []string{}
}
if netConf.Address != "" {
addresses = append(addresses, netConf.Address)
}
addresses := []string{}
if len(netConf.Addresses) > 0 {
addresses = append(addresses, netConf.Addresses...)
}
if netConf.Address != "" {
addresses = append(addresses, netConf.Address)
}
for _, address := range addresses {
err := applyAddress(address, link, netConf)
if err != nil {
log.Errorf("Failed to apply address %s to %s: %v", address, link.Attrs().Name, err)
}
if len(netConf.Addresses) > 0 {
addresses = append(addresses, netConf.Addresses...)
}
for _, address := range addresses {
err := applyAddress(address, link, netConf)
if err != nil {
log.Errorf("Failed to apply address %s to %s: %v", address, link.Attrs().Name, err)
}
}