iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for multiple cdroms for iso builder

This commit is contained in:
Andrei Tonkikh 2018-01-31 20:29:03 +03:00
parent 0861dbc283
commit 9139a6029b
2 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
iso/builder_acc_test.go
View File

@ -6,6 +6,7 @@ import (
"testing"
"github.com/hashicorp/packer/packer"
"github.com/vmware/govmomi/vim25/types"
"fmt"
)
func TestISOBuilderAcc_default(t *testing.T) {
@ -159,7 +160,10 @@ func TestISOBuilderAcc_cdrom(t *testing.T) {
func cdromConfig() string {
config := defaultConfig()
config["iso_path"] = "[datastore1] alpine-standard-3.6.2-x86_64.iso"
config["iso_paths"] = []string{
"[datastore1] test0.iso",
"[datastore1] test1.iso",
}
return commonT.RenderConfig(config)
}
@ -173,17 +177,19 @@ func checkCDRom(t *testing.T) builderT.TestCheckFunc {
t.Fatalf("cannot read VM properties: %v", err)
}
cdrom, err := devices.FindCdrom("")
if err != nil {
t.Fatalf("cannot find cdrom: %v", err)
cdroms := devices.SelectByType((*types.VirtualCdrom)(nil))
if len(cdroms) != 2 {
t.Fatalf("expected 2 cdroms, found %v", len(cdroms))
}
iso, ok := cdrom.Backing.(*types.VirtualCdromIsoBackingInfo)
if !ok {
t.Fatalf("the iso is not connected")
}
expectedFileName := "[datastore1] alpine-standard-3.6.2-x86_64.iso"
if iso.FileName != expectedFileName {
t.Fatalf("invalid iso filename: expected '%v', got '%v'", expectedFileName, iso.FileName)
for i := range cdroms {
iso, ok := cdroms[i].(*types.VirtualCdrom).Backing.(*types.VirtualCdromIsoBackingInfo)
if !ok {
t.Fatalf("the iso 'test%v.iso' is not connected", i)
}
expectedFileName := fmt.Sprintf("[datastore1] test%v.iso", i)
if iso.FileName != expectedFileName {
t.Fatalf("invalid iso filename: expected '%v', got '%v'", expectedFileName, iso.FileName)
}
}
return nil

14
iso/step_add_cdrom.go
View File

@ -4,10 +4,11 @@ import (
"github.com/hashicorp/packer/packer"
"github.com/jetbrains-infra/packer-builder-vsphere/driver"
"github.com/mitchellh/multistep"
"fmt"
)
type CDRomConfig struct {
ISOPath string `mapstructure:"iso_path"`
ISOPaths []string `mapstructure:"iso_paths"`
}
func (c *CDRomConfig) Prepare() []error {
@ -21,13 +22,14 @@ type StepAddCDRom struct {
func (s *StepAddCDRom) Run(state multistep.StateBag) multistep.StepAction {
ui := state.Get("ui").(packer.Ui)
ui.Say("Adding CDRom...")
ui.Say("Adding CDRoms...")
vm := state.Get("vm").(*driver.VirtualMachine)
err := vm.AddCdrom(s.config.ISOPath)
if err != nil {
state.Put("error", err)
return multistep.ActionHalt
for _, path := range s.config.ISOPaths {
if err := vm.AddCdrom(path); err != nil {
state.Put("error", fmt.Errorf("error adding a cdrom: %v", err))
return multistep.ActionHalt
}
}
return multistep.ActionContinue