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

Documentation fixes / making availability_set_id conflict with zones #2185

Merged
merged 4 commits into from
Oct 30, 2018
Merged

Documentation fixes / making availability_set_id conflict with zones #2185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bdc5b96
azurerm_subnet: listing all the possible subnet endpoints
tombuildsstuff Oct 30, 2018
eee4cba
Availability Zones are now out of preview
tombuildsstuff Oct 30, 2018
9ce9537
vm: Availability Set ID now conflicts with Zones
tombuildsstuff Oct 30, 2018
fb826ea
Fixing the linting
tombuildsstuff Oct 30, 2018
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
2 changes: 1 addition & 1 deletion azurerm/resource_arm_eventhub_namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package azurerm
import (
"context"
"fmt"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"log"
"strconv"
"time"
Expand All @@ -14,6 +13,7 @@ import (
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_managed_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ package azurerm

import (
"fmt"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"log"
"strings"

"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2018-06-01/compute"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)

Expand Down
1 change: 1 addition & 0 deletions azurerm/resource_arm_virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ func resourceArmVirtualMachine() *schema.Resource {
StateFunc: func(id interface{}) string {
return strings.ToLower(id.(string))
},
ConflictsWith: []string{"zones"},
},

"identity": {
Expand Down
6 changes: 2 additions & 4 deletions website/docs/d/managed_disk.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ resource "azurerm_virtual_machine" "test" {
## Argument Reference

* `name` - (Required) Specifies the name of the Managed Disk.
* `resource_group_name` - (Required) Specifies the name of the resource group.

* `resource_group_name` - (Required) Specifies the name of the resource group.

## Attributes Reference

Expand All @@ -111,6 +111,4 @@ resource "azurerm_virtual_machine" "test" {
* `os_type` - The operating system for managed disk. Valid values are `Linux` or `Windows`
* `disk_size_gb` - The size of the managed disk in gigabytes.
* `tags` - A mapping of tags assigned to the resource.
* `zones` - (Optional) A collection containing the availability zone the managed disk is allocated in.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
* `zones` - A collection containing the availability zone the managed disk is allocated in.
2 changes: 1 addition & 1 deletion website/docs/r/loadbalancer.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The following arguments are supported:
* `public_ip_address_id` - (Optional) Reference to Public IP address to be associated with the Load Balancer.
* `zones` - (Optional) A collection containing the availability zone to allocate the IP in.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).

## Attributes Reference

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/managed_disk.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ The following arguments are supported:

* `zones` - (Optional) A collection containing the availability zone to allocate the Managed Disk in.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).

For more information on managed disks, such as sizing options and pricing, please check out the
[azure documentation](https://docs.microsoft.com/en-us/azure/storage/storage-managed-disks-overview).
Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/public_ip.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ The following arguments are supported:

* `zones` - (Optional) A collection containing the availability zone to allocate the Public IP in.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).

## Attributes Reference

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/subnet.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ The following arguments are supported:

-> **NOTE:** At this time Subnet <-> Route Table associations need to be configured both using this field (which is now Deprecated) and/or using the `azurerm_subnet_route_table_association` resource. This field is deprecated and will be removed in favour of that resource in the next major version (2.0) of the AzureRM Provider.

* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.Storage`, `Microsoft.Sql`.
* `service_endpoints` - (Optional) The list of Service endpoints to associate with the subnet. Possible values include: `Microsoft.AzureActiveDirectory`, `Microsoft.AzureCosmosDB`, `Microsoft.EventHub`, `Microsoft.KeyVault`, `Microsoft.ServiceBus`, `Microsoft.Sql` and `Microsoft.Storage`.

## Attributes Reference

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/virtual_machine.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ The following arguments are supported:

* `zones` - (Optional) A list of a single item of the Availability Zone which the Virtual Machine should be allocated in.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).

For more information on the different example configurations, please check out the [Azure documentation](https://docs.microsoft.com/en-gb/rest/api/compute/virtualmachines/createorupdate#examples)

Expand Down
6 changes: 3 additions & 3 deletions website/docs/r/virtual_machine_scale_set.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ resource "azurerm_virtual_machine_scale_set" "test" {
max_unhealthy_upgraded_instance_percent = 5
pause_time_between_batches = "PT0S"
}

# required when using rolling upgrade policy
health_probe_id = "${azurerm_lb_probe.test.id}"


sku {
name = "Standard_F2"
Expand Down Expand Up @@ -290,7 +290,7 @@ The following arguments are supported:
* `tags` - (Optional) A mapping of tags to assign to the resource.
* `zones` - (Optional) A collection of availability zones to spread the Virtual Machines over.

-> **Please Note**: Availability Zones are [in Preview and only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview) - as such you must be opted into the Preview to use this functionality. You can [opt into the Availability Zones Preview in the Azure Portal](http://aka.ms/azenroll).
-> **Please Note**: Availability Zones are [only supported in several regions at this time](https://docs.microsoft.com/en-us/azure/availability-zones/az-overview).

`sku` supports the following:

Expand Down