diff options
Diffstat (limited to 'addDroplet.go')
| -rw-r--r-- | addDroplet.go | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/addDroplet.go b/addDroplet.go index 629f0e7..873edc7 100644 --- a/addDroplet.go +++ b/addDroplet.go @@ -308,11 +308,13 @@ func updateNetwork(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Domain } } if !found { - if CheckUniqueMac(cluster, mac) { - } else { - log.Info("droplet", d.Hostname, "duplicate mac address", mac) - return nil, errors.New("duplicate mac address") - } + /* + if CheckUniqueMac(cluster, mac) { + } else { + log.Info("droplet", d.Hostname, "duplicate mac address", mac) + return nil, errors.New("duplicate mac address") + } + */ var eth *pb.Network eth = new(pb.Network) eth.Mac = mac @@ -360,7 +362,7 @@ func updateDisk(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Domain) ( continue } - e, err := InsertFilename(cluster, d, filename) + e, err := InsertFilename(d, filename) if err != nil { return alle, err } @@ -368,23 +370,6 @@ func updateDisk(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Domain) ( continue } alle = append(alle, e) - - /* - var found bool = false - for _, disk := range d.Disks { - if disk.Filename == filename { - log.Verbose("OKAY. FOUND filename", filename) - found = true - } - } - if !found { - var disk *pb.Disk - disk = new(pb.Disk) - disk.Filename = filename - d.Disks = append(d.Disks, disk) - log.Info("New filename", filename) - } - */ } return alle, nil } |