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.

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

azurerm_orchestrated_virtual_machine_scale_set - Support new VMSS Flex functionality #14003

Merged
merged 24 commits into from
Nov 13, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ef2237b
Initial check-in
WodansSon Nov 3, 2021
119d9c8
Add ovmss sku spilt func
WodansSon Nov 3, 2021
722f212
update recoveryservices and add documentation
WodansSon Nov 3, 2021
8344890
update vendor
WodansSon Nov 3, 2021
eda58c2
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
WodansSon Nov 3, 2021
ee7d802
go mod vendor
katbyte Nov 3, 2021
79cbcf9
Merge branch 'main' into f-ovmss
katbyte Nov 3, 2021
98addee
update test case to remove depricated field
WodansSon Nov 3, 2021
8246e4d
Merge branch 'main' into f-ovmss
WodansSon Nov 9, 2021
d5fd020
Remove support for extensions
WodansSon Nov 10, 2021
cca11c7
Add note to documentation about extension support
WodansSon Nov 10, 2021
5d9576f
Split Capacity out of sku_name
WodansSon Nov 11, 2021
0e2d689
Update sku parsing due to spliting out capacity
WodansSon Nov 11, 2021
7071fcb
Fix comment format
WodansSon Nov 11, 2021
f107578
Add retry logic
WodansSon Nov 11, 2021
2f31be8
Update error message for create retry
WodansSon Nov 11, 2021
02b582c
Added case for unretryable in retry else case
WodansSon Nov 11, 2021
ecd3632
Update website/docs/r/orchestrated_virtual_machine_scale_set.html.mar…
WodansSon Nov 11, 2021
cb4f89d
Update website/docs/r/orchestrated_virtual_machine_scale_set.html.mar…
WodansSon Nov 11, 2021
9ced15a
Make instances optional and computed
WodansSon Nov 11, 2021
88e066a
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
WodansSon Nov 12, 2021
0e66018
Update err msg to match main
WodansSon Nov 12, 2021
7ee00df
Change field name to termination_notification
WodansSon Nov 13, 2021
ad90800
Add TODO note for 3.0
WodansSon Nov 13, 2021
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
Prev Previous commit
Next Next commit
Add note to documentation about extension support
  • Loading branch information
WodansSon committed Nov 10, 2021
commit cca11c72258eadaae934d825dfae22babd4ed62a
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func resourceOrchestratedVirtualMachineScaleSet() *pluginsdk.Resource {
}, false),
},

// Due to bug in RP extensions cannot curretntly be supported in Terraform
// Due to bug in RP extensions cannot curretntly be supported in Terraform ETA for full support is mid Jan 2022
// "extension": OrchestratedVirtualMachineScaleSetExtensionsSchema(),

// "extensions_time_budget": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Manages an Orchestrated Virtual Machine Scale Set.

~> **NOTE** Orchestrated Virtual Machine Scale Sets are in Public Preview and it may receive breaking changes - [more details can be found in the Azure Documentation](https://docs.microsoft.com/azure/virtual-machine-scale-sets/orchestration-modes).

~> **NOTE:** Due to a bug in the service code `extensions` are not currently supported in the `azurerm_orchestrated_virtual_machine_scale_set` resource. The ETA for `extensions` support is tentatively set for January 15, 2022.

## Example Usage

Expand Down Expand Up @@ -59,11 +60,14 @@ The following arguments are supported:
* `computer_name_prefix` - (Optional) The prefix which should be used for the name of the Virtual Machines in this Scale Set. If unspecified this defaults to the value for the name field. If the value of the name field is not a valid `computer_name_prefix`, then you must specify `computer_name_prefix`.

* `data_disk` - (Optional) One or more `data_disk` blocks as defined below.

<!--
* `extension` - (Optional) One or more `extension` blocks as defined below

~> **NOTE:** The `extension` block is only available in the Opt-In beta and requires that the Environment Variable `ARM_PROVIDER_VMSS_EXTENSIONS_BETA` is set to `true` to be used.

* `extensions_time_budget` - (Optional) Specifies the time alloted for all extensions to start. The time duration should be between 15 minutes and 120 minutes (inclusive) and should be specified in ISO 8601 format. The default value is 90 minutes (PT1H30M).
-->

* `eviction_policy` - (Optional) The Policy which should be used Virtual Machines are Evicted from the Scale Set. Changing this forces a new resource to be created.

* `identity` - (Optional) A `identity` block as defined below.
Expand Down Expand Up @@ -228,7 +232,7 @@ A `data_disk` block supports the following:
* `storage_account_type` - (Required) The Type of Storage Account which should back this Data Disk. Possible values include Standard_LRS, StandardSSD_LRS, Premium_LRS and UltraSSD_LRS.

---

<!--
An `extension` block supports the following:

~> **NOTE:** This block is only available in the Opt-In beta and requires that the Environment Variable `ARM_PROVIDER_VMSS_EXTENSIONS_BETA` is set to `true` to be used.
Expand All @@ -250,6 +254,7 @@ An `extension` block supports the following:
~> **NOTE:** Keys within the `protected_settings` block are notoriously case-sensitive, where the casing required (e.g. `TitleCase` vs `snakeCase`) depends on the Extension being used. Please refer to the documentation for the specific Orchestrated Virtual Machine Extension you're looking to use for more information.

---
-->

A `ip_configuration` block supports the following:

Expand Down