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

Revert "Renamed the terse option, `cores`, to to the less-terse version `cores_per_socket`." 

This reverts commit 0c37a3c68f and avoids bikeshedding from other committers.
This commit is contained in:
Ali Rizvi-Santiago 2019-01-17 14:49:07 -06:00
parent 0c37a3c68f
commit 9d2f98394e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builder/vmware/common/hw_config.go
View File

@ -14,7 +14,7 @@ type HWConfig struct {
// cpu information // cpu information
CpuCount int `mapstructure:"cpus"` CpuCount int `mapstructure:"cpus"`
MemorySize int `mapstructure:"memory"` MemorySize int `mapstructure:"memory"`
CoreCount int `mapstructure:"cores_per_socket"` CoreCount int `mapstructure:"cores"`
// network type and adapter // network type and adapter
Network string `mapstructure:"network"` Network string `mapstructure:"network"`

3
website/source/docs/builders/vmware-iso.html.md.erb
View File

@ -100,8 +100,7 @@ builder.
- `cpus` (number) - The number of cpus to use when building the VM. - `cpus` (number) - The number of cpus to use when building the VM.
- `cores_per_socket` (number) - The number of cores per socket to use when - `cores` (number) - The number of cores per socket to use when building the VM.
building the VM.
- `cdrom_adapter_type` (string) - The adapter type (or bus) that will be used - `cdrom_adapter_type` (string) - The adapter type (or bus) that will be used
by the cdrom device. This is chosen by default based on the disk adapter by the cdrom device. This is chosen by default based on the disk adapter