diff options
| -rw-r--r-- | config.go | 5 | ||||
| -rw-r--r-- | libvirtxml.go | 3 | ||||
| -rw-r--r-- | main.go | 2 | ||||
| -rw-r--r-- | start.go | 30 |
4 files changed, 27 insertions, 13 deletions
@@ -125,10 +125,7 @@ func writeConfigFile() { os.Exit(-1) } - if me.events.WriteConfigJSON() { - os.Exit(-1) - } - if me.events.WriteConfigTEXT() { + if err := me.events.ConfigRead(); err != nil { os.Exit(-1) } diff --git a/libvirtxml.go b/libvirtxml.go index fe2d723..470b332 100644 --- a/libvirtxml.go +++ b/libvirtxml.go @@ -212,8 +212,7 @@ func addEthernetTap(domcfg *libvirtxml.Domain, mac string) { who don't have bridge groups or proper cluster backend networking literally leaving this blank makes the interface 'tap0' */ - Target: &libvirtxml.DomainInterfaceTarget{ - }, + Target: &libvirtxml.DomainInterfaceTarget{}, } // Add the new disk to the domain configuration @@ -106,7 +106,7 @@ func main() { } if argv.Start != "" { - startDropletXml(argv.Start) + newStart(argv.Start) os.Exit(0) } @@ -3,16 +3,15 @@ package main import ( - "fmt" "os" "path/filepath" + "go.wit.com/lib/virtigoxml" "go.wit.com/log" "libvirt.org/go/libvirtxml" ) -// generate the XML for 'virsh create' -func startDropletXml(start string) { +func newStart(start string) { meDrop := findDroplet(start) d := meDrop.pb if d == nil { @@ -22,11 +21,29 @@ func startDropletXml(start string) { log.Info("start droplet here:", d.Hostname) domcfg := &libvirtxml.Domain{} - addDefaultXml(domcfg, "standard.x86") + newAddXml(domcfg, "standard.x86") // addDefaultXml(domcfg, "memory") // addDefaultXml(domcfg, "network") - addDefaultXml(domcfg, "spice") - addDefaultXml(domcfg, "qcow") + newAddXml(domcfg, "qcow") + + virtigoxml.StartDropletXml(d, domcfg, start) +} + +func newAddXml(domcfg *libvirtxml.Domain, filename string) error { + fullname := "resources/xml/" + filename + ".xml" + pfile, err := resources.ReadFile(fullname) + if err != nil { + log.Println("ERROR:", err) + return err + } + + return virtigoxml.AddDefaultXml(domcfg, string(pfile)) +} + +/* +// generate the XML for 'virsh create' +func startDropletXml(start string) { + domcfg.Type = "kvm" domcfg.Name = d.Hostname @@ -82,6 +99,7 @@ func startDropletXml(start string) { writeoutXml(domcfg, d.Hostname) os.Exit(-1) } +*/ func findDisk(filename string) string { for _, dirname := range me.cluster.Dirs { |