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

Add 'usb_controller' option

This commit is contained in:
Michael Kuzmin 2018-02-27 03:22:52 +03:00
parent 39f1e4a394
commit ba06b00e70
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
driver/vm.go
View File

@ -41,15 +41,16 @@ type CreateConfig struct {
DiskThinProvisioned bool DiskThinProvisioned bool
DiskControllerType string // example: "scsi", "pvscsi" DiskControllerType string // example: "scsi", "pvscsi"
Annotation string Annotation string
Name string Name string
Folder string Folder string
Host string Host string
ResourcePool string ResourcePool string
Datastore string Datastore string
GuestOS string // example: otherGuest GuestOS string // example: otherGuest
Network string // "" for default network Network string // "" for default network
NetworkCard string // example: vmxnet3 NetworkCard string // example: vmxnet3
USBController bool
} }
func (d *Driver) NewVM(ref *types.ManagedObjectReference) *VirtualMachine { func (d *Driver) NewVM(ref *types.ManagedObjectReference) *VirtualMachine {
@ -108,6 +109,14 @@ func (d *Driver) CreateVM(config *CreateConfig) (*VirtualMachine, error) {
return nil, err return nil, err
} }
if config.USBController {
t := true
usb := &types.VirtualUSBController{
EhciEnabled: &t,
}
devices = append(devices, usb)
}
createSpec.DeviceChange, err = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd) createSpec.DeviceChange, err = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
if err != nil { if err != nil {
return nil, err return nil, err

18
iso/step_create.go
View File

@ -14,14 +14,15 @@ type CreateConfig struct {
DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"` DiskThinProvisioned bool `mapstructure:"disk_thin_provisioned"`
DiskControllerType string `mapstructure:"disk_controller_type"` DiskControllerType string `mapstructure:"disk_controller_type"`
VMName string `mapstructure:"vm_name"` VMName string `mapstructure:"vm_name"`
Folder string `mapstructure:"folder"` Folder string `mapstructure:"folder"`
Host string `mapstructure:"host"` Host string `mapstructure:"host"`
ResourcePool string `mapstructure:"resource_pool"` ResourcePool string `mapstructure:"resource_pool"`
Datastore string `mapstructure:"datastore"` Datastore string `mapstructure:"datastore"`
GuestOSType string `mapstructure:"guest_os_type"` GuestOSType string `mapstructure:"guest_os_type"`
Network string `mapstructure:"network"` Network string `mapstructure:"network"`
NetworkCard string `mapstructure:"network_card"` NetworkCard string `mapstructure:"network_card"`
USBController bool `mapstructure:"usb_controller"`
} }
func (c *CreateConfig) Prepare() []error { func (c *CreateConfig) Prepare() []error {
@ -79,6 +80,7 @@ func (s *StepCreateVM) Run(state multistep.StateBag) multistep.StepAction {
GuestOS: s.Config.GuestOSType, GuestOS: s.Config.GuestOSType,
Network: s.Config.Network, Network: s.Config.Network,
NetworkCard: s.Config.NetworkCard, NetworkCard: s.Config.NetworkCard,
USBController: s.Config.USBController,
}) })
if err != nil { if err != nil {