Skip to content

Commit

Permalink
Specify 'memory_guaranteed' when 'include_vm_memory_overhead=true' in…
Browse files Browse the repository at this point in the history
… `vcd_org_vdc` (vmware#1281)
  • Loading branch information
Didainius authored Jun 17, 2024
1 parent da3a095 commit 959bf4d
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .changes/v3.13.0/1281-notes.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* Tests for FLEX Org VDC must set `memory_guaranteed` when `include_vm_memory_overhead=true`
[GH-1281]
3 changes: 2 additions & 1 deletion vcd/resource_vcd_nsxt_edgegateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,9 @@ resource "vcd_org_vdc" "newVdc" {
enable_fast_provisioning = true
delete_force = true
delete_recursive = true
elasticity = true
elasticity = true
include_vm_memory_overhead = true
memory_guaranteed = 1.0
}
`

Expand Down
3 changes: 2 additions & 1 deletion vcd/resource_vcd_vdc_group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,9 @@ resource "vcd_org_vdc" "newVdc" {
enable_fast_provisioning = true
delete_force = true
delete_recursive = true
elasticity = true
elasticity = true
include_vm_memory_overhead = true
memory_guaranteed = 1.0
}
`
const testAccVcdVdcGroupOrgProvider = testAccVcdVdcGroupNewVdc + `
Expand Down
1 change: 1 addition & 0 deletions vcd/vdc_group_common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ resource "vcd_org_vdc" "newVdc" {
delete_recursive = true
include_vm_memory_overhead = true
elasticity = true
memory_guaranteed = 1.0
}
resource "vcd_vdc_group" "test1" {
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/org_vdc.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ The following arguments are supported:
* `allow_over_commit` - (Optional) Set to false to disallow creation of the VDC if the `allocation_model` is AllocationPool or ReservationPool and the ComputeCapacity you specified is greater than what the backing Provider VDC can supply. Default is true.
* `enable_vm_discovery` - (Optional) If true, discovery of vCenter VMs is enabled for resource pools backing this VDC. If false, discovery is disabled. If left unspecified, the actual behaviour depends on enablement at the organization level and at the system level.
* `elasticity` - (Optional, *v2.7+*, *VCD 9.7+*) Indicates if the Flex VDC should be elastic. Required with the Flex allocation model.
* `include_vm_memory_overhead` - (Optional, *v2.7+*, *VCD 9.7+*) Indicates if the Flex VDC should include memory overhead into its accounting for admission control. Required with the Flex allocation model.
* `include_vm_memory_overhead` - (Optional, *v2.7+*, *VCD 9.7+*) Indicates if the Flex VDC should include memory overhead into its accounting for admission control. Required with the Flex allocation model. `memory_guaranteed` must also be specified together with this parameter.
* `delete_force` - (Optional, but recommended) When destroying use `delete_force=true` to remove a VDC and any objects it contains, regardless of their state. Default is `false`
* `delete_recursive` - (Optional, but recommended) When destroying use `delete_recursive=true` to remove the VDC and any objects it contains that are in a state that normally allows removal. Default is `false`
* `default_compute_policy_id` - (Optional, *v3.8+*, *VCD 10.2+*) ID of the default Compute Policy for this VDC. It can be a VM Sizing Policy, a VM Placement Policy or a vGPU Policy.
Expand Down
1 change: 1 addition & 0 deletions website/docs/r/vm_vgpu_policy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ resource "vcd_org_vdc" "example_org_vdc" {
elasticity = true
include_vm_memory_overhead = true
memory_guaranteed = 1.0
default_compute_policy_id = vcd_vm_vgpu_policy.example_vgpu_policy.id
vm_vgpu_policy_ids = [vcd_vm_vgpu_policy.example_vgpu_policy.id]
}
Expand Down

0 comments on commit 959bf4d

Please sign in to comment.