From 9d2f98394e08da38cf0aa5d69b6d623aa5b19504 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Thu, 17 Jan 2019 14:49:07 -0600 Subject: [PATCH] Revert "Renamed the terse option, `cores`, to to the less-terse version `cores_per_socket`." This reverts commit 0c37a3c68fd859fd97ce645210d8bb4b19ae96dc and avoids bikeshedding from other committers. --- builder/vmware/common/hw_config.go | 2 +- website/source/docs/builders/vmware-iso.html.md.erb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/builder/vmware/common/hw_config.go b/builder/vmware/common/hw_config.go index eb3ed46c2..588d295f1 100644 --- a/builder/vmware/common/hw_config.go +++ b/builder/vmware/common/hw_config.go @@ -14,7 +14,7 @@ type HWConfig struct { // cpu information CpuCount int `mapstructure:"cpus"` MemorySize int `mapstructure:"memory"` - CoreCount int `mapstructure:"cores_per_socket"` + CoreCount int `mapstructure:"cores"` // network type and adapter Network string `mapstructure:"network"` diff --git a/website/source/docs/builders/vmware-iso.html.md.erb b/website/source/docs/builders/vmware-iso.html.md.erb index e7ecb350d..180af5c08 100644 --- a/website/source/docs/builders/vmware-iso.html.md.erb +++ b/website/source/docs/builders/vmware-iso.html.md.erb @@ -100,8 +100,7 @@ builder. - `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 - building the VM. +- `cores` (number) - The number of cores per socket to use when building the VM. - `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