Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/virtual_machine: Unlock memory reservation #680

Merged
merged 1 commit into from
Jan 7, 2019
Merged

r/virtual_machine: Unlock memory reservation #680

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions vsphere/virtual_machine_config_structure.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,28 +751,29 @@ func expandVirtualMachineConfigSpec(d *schema.ResourceData, client *govmomi.Clie
}

obj := types.VirtualMachineConfigSpec{
Name: d.Get("name").(string),
GuestId: getWithRestart(d, "guest_id").(string),
AlternateGuestName: getWithRestart(d, "alternate_guest_name").(string),
Annotation: d.Get("annotation").(string),
Tools: expandToolsConfigInfo(d),
Flags: expandVirtualMachineFlagInfo(d),
NumCPUs: expandCPUCountConfig(d),
NumCoresPerSocket: int32(getWithRestart(d, "num_cores_per_socket").(int)),
MemoryMB: expandMemorySizeConfig(d),
MemoryHotAddEnabled: getBoolWithRestart(d, "memory_hot_add_enabled"),
CpuHotAddEnabled: getBoolWithRestart(d, "cpu_hot_add_enabled"),
CpuHotRemoveEnabled: getBoolWithRestart(d, "cpu_hot_remove_enabled"),
CpuAllocation: expandVirtualMachineResourceAllocation(d, "cpu"),
MemoryAllocation: expandVirtualMachineResourceAllocation(d, "memory"),
ExtraConfig: expandExtraConfig(d),
SwapPlacement: getWithRestart(d, "swap_placement_policy").(string),
BootOptions: expandVirtualMachineBootOptions(d, client),
VAppConfig: vappConfig,
Firmware: getWithRestart(d, "firmware").(string),
NestedHVEnabled: getBoolWithRestart(d, "nested_hv_enabled"),
VPMCEnabled: getBoolWithRestart(d, "cpu_performance_counters_enabled"),
LatencySensitivity: expandLatencySensitivity(d),
Name: d.Get("name").(string),
GuestId: getWithRestart(d, "guest_id").(string),
AlternateGuestName: getWithRestart(d, "alternate_guest_name").(string),
Annotation: d.Get("annotation").(string),
Tools: expandToolsConfigInfo(d),
Flags: expandVirtualMachineFlagInfo(d),
NumCPUs: expandCPUCountConfig(d),
NumCoresPerSocket: int32(getWithRestart(d, "num_cores_per_socket").(int)),
MemoryMB: expandMemorySizeConfig(d),
MemoryHotAddEnabled: getBoolWithRestart(d, "memory_hot_add_enabled"),
CpuHotAddEnabled: getBoolWithRestart(d, "cpu_hot_add_enabled"),
CpuHotRemoveEnabled: getBoolWithRestart(d, "cpu_hot_remove_enabled"),
CpuAllocation: expandVirtualMachineResourceAllocation(d, "cpu"),
MemoryAllocation: expandVirtualMachineResourceAllocation(d, "memory"),
MemoryReservationLockedToMax: getMemoryReservationLockedToMax(d),
ExtraConfig: expandExtraConfig(d),
SwapPlacement: getWithRestart(d, "swap_placement_policy").(string),
BootOptions: expandVirtualMachineBootOptions(d, client),
VAppConfig: vappConfig,
Firmware: getWithRestart(d, "firmware").(string),
NestedHVEnabled: getBoolWithRestart(d, "nested_hv_enabled"),
VPMCEnabled: getBoolWithRestart(d, "cpu_performance_counters_enabled"),
LatencySensitivity: expandLatencySensitivity(d),
}

return obj, nil
Expand Down Expand Up @@ -860,3 +861,17 @@ func expandVirtualMachineConfigSpecChanged(d *schema.ResourceData, client *govmo
// Return the new spec and compare
return newSpec, !reflect.DeepEqual(oldSpec, newSpec), nil
}

// getMemoryReservationLockedToMax determines if the memory_reservation is not
// set to be equal to memory. If they are not equal, then the memory
// reservation needs to be unlocked from the maximum. Rather than supporting
// the locking reservation to max option, we can set memory_reservation to
// memory in the configuration. Not supporting the option causes problems when
// cloning from a template that has it enabled. The solution is to set it to
// false when needed, but leave it alone when the change is not necessary.
func getMemoryReservationLockedToMax(d *schema.ResourceData) *bool {
if d.Get("memory_reservation").(int) != d.Get("memory").(int) {
return structure.BoolPtr(false)
}
return nil
}