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

fix defaulting/lack thereof for cpu count and memory in vmware template

This commit is contained in:
Megan Marsh 2018-11-27 15:43:48 -08:00
parent f380028b41
commit 89fb8f0d3e
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
builder/vmware/iso/step_create_vmx.go
View File

@ -315,6 +315,18 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
templateData.Serial_Host = "" templateData.Serial_Host = ""
templateData.Serial_Auto = "FALSE" templateData.Serial_Auto = "FALSE"
// Set the number of cpus if it was specified
if config.HWConfig.CpuCount > 0 {
templateData.CpuCount = strconv.Itoa(config.HWConfig.CpuCount)
}
// Apply the memory size that was specified
if config.HWConfig.MemorySize > 0 {
templateData.MemorySize = strconv.Itoa(config.HWConfig.MemorySize)
} else {
templateData.MemorySize = "512"
}
switch serial.Union.(type) { switch serial.Union.(type) {
case *vmwcommon.SerialConfigPipe: case *vmwcommon.SerialConfigPipe:
templateData.Serial_Type = "pipe" templateData.Serial_Type = "pipe"
@ -412,15 +424,8 @@ func (s *stepCreateVMX) Run(_ context.Context, state multistep.StateBag) multist
/// Now to handle options that will modify the template /// Now to handle options that will modify the template
vmxData := vmwcommon.ParseVMX(vmxContents) vmxData := vmwcommon.ParseVMX(vmxContents)
if vmxData["numvcpus"] == "" {
// Set the number of cpus if it was specified delete(vmxData, "numvcpus")
if config.HWConfig.CpuCount > 0 {
vmxData["numvcpus"] = strconv.Itoa(config.HWConfig.CpuCount)
}
// Apply the memory size that was specified
if config.HWConfig.MemorySize > 0 {
vmxData["memsize"] = strconv.Itoa(config.HWConfig.MemorySize)
} }
/// Write the vmxData to the vmxPath /// Write the vmxData to the vmxPath