diff options
| -rw-r--r-- | libvirtxml.go | 11 | ||||
| -rw-r--r-- | start.go | 5 |
2 files changed, 9 insertions, 7 deletions
diff --git a/libvirtxml.go b/libvirtxml.go index 88b1695..9cfd019 100644 --- a/libvirtxml.go +++ b/libvirtxml.go @@ -29,21 +29,24 @@ func makeStandardXml(hostname string) *libvirtxml.Domain { } */ -func writeoutXml(domcfg *libvirtxml.Domain, filename string) bool { +func writeoutXml(domcfg *libvirtxml.Domain, filename string) error { xmldoc, err := domcfg.Marshal() if err != nil { fmt.Println("can't make xml file error:\n", err) - return false + return err } outfile := "/tmp/" + filename + ".xml" - regfile, _ := os.OpenFile(outfile, os.O_RDWR|os.O_CREATE, 0666) + regfile, err := os.OpenFile(outfile, os.O_RDWR|os.O_CREATE, 0666) + if err != nil { + return err + } fmt.Fprintln(regfile, xmldoc) log.Info("File is in", outfile) regfile.Close() - return true + return nil } func setDiskFilename(domcfg *libvirtxml.Domain, filename string) { @@ -14,7 +14,7 @@ import ( ) // generate the XML for 'virsh create' -func StartDropletXml(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Domain, hostname string) { +func GenerateDropletXml(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Domain, hostname string) error { /* if d == nil { log.Info("droplet is nil") @@ -87,8 +87,7 @@ func StartDropletXml(cluster *pb.Cluster, d *pb.Droplet, domcfg *libvirtxml.Doma } } - writeoutXml(domcfg, d.Hostname) - os.Exit(-1) + return writeoutXml(domcfg, d.Hostname) } func findDisk(dirs []string, filename string) string { |