Commit 7dfb837d authored by Eric Richardson's avatar Eric Richardson Committed by Shawn Neal

Formatting cleanups from `go fmt`

parent fab9ca9c
...@@ -34,26 +34,26 @@ func (stepCreateDisk) Run(state multistep.StateBag) multistep.StepAction { ...@@ -34,26 +34,26 @@ func (stepCreateDisk) Run(state multistep.StateBag) multistep.StepAction {
} }
state.Put("full_disk_path", full_disk_path) state.Put("full_disk_path", full_disk_path)
if len(config.AdditionalDiskSize) > 0 { if len(config.AdditionalDiskSize) > 0 {
// stash the disk paths we create // stash the disk paths we create
additional_paths := make([]string,len(config.AdditionalDiskSize)) additional_paths := make([]string, len(config.AdditionalDiskSize))
ui.Say("Creating additional hard drives...") ui.Say("Creating additional hard drives...")
for i, additionalsize := range config.AdditionalDiskSize { for i, additionalsize := range config.AdditionalDiskSize {
additionalpath := filepath.Join(config.OutputDir, fmt.Sprintf("%s-%d.vmdk",config.DiskName,i+1)) additionalpath := filepath.Join(config.OutputDir, fmt.Sprintf("%s-%d.vmdk", config.DiskName, i+1))
size := fmt.Sprintf("%dM", uint64(additionalsize)) size := fmt.Sprintf("%dM", uint64(additionalsize))
if err := driver.CreateDisk(additionalpath, size, config.DiskTypeId); err != nil { if err := driver.CreateDisk(additionalpath, size, config.DiskTypeId); err != nil {
err := fmt.Errorf("Error creating additional disk: %s", err) err := fmt.Errorf("Error creating additional disk: %s", err)
state.Put("error",err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }
additional_paths[i] = additionalpath additional_paths[i] = additionalpath
} }
state.Put("additional_disk_paths", additional_paths) state.Put("additional_disk_paths", additional_paths)
} }
......
...@@ -21,8 +21,8 @@ type vmxTemplateData struct { ...@@ -21,8 +21,8 @@ type vmxTemplateData struct {
} }
type additionalDiskTemplateData struct { type additionalDiskTemplateData struct {
DiskNumber int DiskNumber int
DiskName string DiskName string
} }
// This step creates the VMX file for the VM. // This step creates the VMX file for the VM.
...@@ -75,22 +75,22 @@ func (s *stepCreateVMX) Run(state multistep.StateBag) multistep.StepAction { ...@@ -75,22 +75,22 @@ func (s *stepCreateVMX) Run(state multistep.StateBag) multistep.StepAction {
vmxTemplate = string(rawBytes) vmxTemplate = string(rawBytes)
} }
if len(config.AdditionalDiskSize) > 0 { if len(config.AdditionalDiskSize) > 0 {
for i, _ := range config.AdditionalDiskSize { for i, _ := range config.AdditionalDiskSize {
data := &additionalDiskTemplateData{ data := &additionalDiskTemplateData{
DiskNumber: i+1, DiskNumber: i + 1,
DiskName: config.DiskName, DiskName: config.DiskName,
} }
diskTemplate, err := config.tpl.Process(DefaultAdditionalDiskTemplate,data) diskTemplate, err := config.tpl.Process(DefaultAdditionalDiskTemplate, data)
if err != nil { if err != nil {
err := fmt.Errorf("Error preparing VMX template for additional disk: %s", err) err := fmt.Errorf("Error preparing VMX template for additional disk: %s", err)
state.Put("error", err) state.Put("error", err)
ui.Error(err.Error()) ui.Error(err.Error())
return multistep.ActionHalt return multistep.ActionHalt
} }
vmxTemplate += diskTemplate vmxTemplate += diskTemplate
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment