todo: need to generate mac addrs
Signed-off-by: Jeff Carr <jcarr@wit.com>
This commit is contained in:
parent
9528d4c0fb
commit
a3cffbf1c0
|
@ -241,21 +241,25 @@ func updateNetwork(d *DropletT, domcfg *libvirtxml.Domain) (*pb.Event, error) {
|
||||||
// fmt.Printf("source: %+v\n", iface.Source)
|
// fmt.Printf("source: %+v\n", iface.Source)
|
||||||
hwaddr = iface.MAC.Address
|
hwaddr = iface.MAC.Address
|
||||||
}
|
}
|
||||||
if iface.Source == nil {
|
if iface.Source == nil {
|
||||||
fmt.Printf("non-standard network: %+v\n", iface)
|
fmt.Printf("non-standard network: %+v\n", iface)
|
||||||
return nil, errors.New("non-standard network")
|
return nil, errors.New("non-standard network")
|
||||||
}
|
}
|
||||||
|
|
||||||
if iface.Source.Bridge == nil {
|
if iface.Source.Bridge == nil {
|
||||||
fmt.Printf("non-standard network: %+v\n", iface)
|
fmt.Printf("non-standard network: %+v\n", iface)
|
||||||
return nil, errors.New("bridge is blank nil and no mac address")
|
return nil, errors.New("bridge is blank nil and no mac address")
|
||||||
}
|
}
|
||||||
if iface.Source.Bridge.Bridge == "" {
|
if iface.Source.Bridge.Bridge == "" {
|
||||||
return nil, errors.New("bridge is blank and no mac address")
|
return nil, errors.New("bridge is blank and no mac address")
|
||||||
}
|
}
|
||||||
// log.Info("network has bridge:", iface.Source.Bridge.Bridge)
|
// log.Info("network has bridge:", iface.Source.Bridge.Bridge)
|
||||||
brname = iface.Source.Bridge.Bridge
|
brname = iface.Source.Bridge.Bridge
|
||||||
hwaddr = "generate"
|
if hwaddr == "" {
|
||||||
|
hwaddr = "generate " + domcfg.Name
|
||||||
|
log.Info("need to generate mac addr for bridge:", brname)
|
||||||
|
// return nil, errors.New("need to generate mac addr for bridge: " + brname)
|
||||||
|
}
|
||||||
macs[hwaddr] = brname
|
macs[hwaddr] = brname
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue