docs/provider/azure/vmss: managed_disk_type, typos;sidebar fix for VM resources (#14906) (#14915)

This commit is contained in:
Ebru Cucen 2017-05-30 16:52:25 +01:00 committed by Tom Harvey
parent 832b7bd456
commit 3c8a19f65e
3 changed files with 14 additions and 17 deletions

View File

@ -1,7 +1,7 @@
--- ---
layout: "azurerm" layout: "azurerm"
page_title: "Azure Resource Manager: azurerm_virtual_machine" page_title: "Azure Resource Manager: azurerm_virtual_machine"
sidebar_current: "docs-azurerm-resource-virtualmachine" sidebar_current: "docs-azurerm-resource-virtual-machine"
description: |- description: |-
Create a Virtual Machine. Create a Virtual Machine.
--- ---

View File

@ -1,12 +1,12 @@
--- ---
layout: "azurerm" layout: "azurerm"
page_title: "Azure Resource Manager: azurerm_virtual_machine_scale_sets" page_title: "Azure Resource Manager: azurerm_virtual_machine_scale_set"
sidebar_current: "docs-azurerm-resource-virtualmachine-scale-sets" sidebar_current: "docs-azurerm-resource-virtualmachine-scale-set"
description: |- description: |-
Create a Virtual Machine scale set. Create a Virtual Machine scale set.
--- ---
# azurerm\_virtual\_machine\_scale\_sets # azurerm\_virtual\_machine\_scale\_set
Create a virtual machine scale set. Create a virtual machine scale set.
@ -108,7 +108,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
## Example Usage with Managed Disks ## Example Usage with Managed Disks
``` ```hcl
resource "azurerm_resource_group" "test" { resource "azurerm_resource_group" "test" {
name = "acctestrg" name = "acctestrg"
location = "West US 2" location = "West US 2"
@ -189,7 +189,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
} }
storage_profile_os_disk { storage_profile_os_disk {
name = "myosdisk" name = ""
caching = "ReadWrite" caching = "ReadWrite"
create_option = "FromImage" create_option = "FromImage"
managed_disk_type = "Standard_LRS" managed_disk_type = "Standard_LRS"
@ -239,10 +239,8 @@ resource "azurerm_virtual_machine_scale_set" "test" {
The following arguments are supported: The following arguments are supported:
* `name` - (Required) Specifies the name of the virtual machine scale set resource. Changing this forces a * `name` - (Required) Specifies the name of the virtual machine scale set resource. Changing this forces a new resource to be created.
new resource to be created. * `resource_group_name` - (Required) The name of the resource group in which to create the virtual machine scale set. Changing this forces a new resource to be created.
* `resource_group_name` - (Required) The name of the resource group in which to
create the virtual machine scale set. Changing this forces a new resource to be created.
* `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created. * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created.
* `sku` - (Required) A sku block as documented below. * `sku` - (Required) A sku block as documented below.
* `upgrade_policy_mode` - (Required) Specifies the mode of an upgrade to virtual machines in the scale set. Possible values, `Manual` or `Automatic`. * `upgrade_policy_mode` - (Required) Specifies the mode of an upgrade to virtual machines in the scale set. Possible values, `Manual` or `Automatic`.
@ -327,7 +325,7 @@ The following arguments are supported:
`storage_profile_os_disk` supports the following: `storage_profile_os_disk` supports the following:
* `name` - (Required) Specifies the disk name. * `name` - (Required) Specifies the disk name. Value must be blank (`""`) when `managed_disk_type` is specified.
* `vhd_containers` - (Optional) Specifies the vhd uri. Cannot be used when `image` or `managed_disk_type` is specified. * `vhd_containers` - (Optional) Specifies the vhd uri. Cannot be used when `image` or `managed_disk_type` is specified.
* `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value you must be either `Standard_LRS` or `Premium_LRS`. Cannot be used when `vhd_containers` or `image` is specified. * `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value you must be either `Standard_LRS` or `Premium_LRS`. Cannot be used when `vhd_containers` or `image` is specified.
* `create_option` - (Required) Specifies how the virtual machine should be created. The only possible option is `FromImage`. * `create_option` - (Required) Specifies how the virtual machine should be created. The only possible option is `FromImage`.
@ -340,11 +338,10 @@ The following arguments are supported:
`storage_profile_data_disk` supports the following: `storage_profile_data_disk` supports the following:
* `lun` - (Required) Specifies the Logical Unit Number of the disk in each virtual machine in the scale set. * `lun` - (Required) Specifies the Logical Unit Number of the disk in each virtual machine in the scale set.
`Premium_LRS`.
* `create_option` - (Optional) Specifies how the data disk should be created. The only possible options are `FromImage` and `Empty`. * `create_option` - (Optional) Specifies how the data disk should be created. The only possible options are `FromImage` and `Empty`.
* `caching` - (Optional) Specifies the caching requirements. Possible values include: `None` (default), `ReadOnly`, `ReadWrite`. * `caching` - (Optional) Specifies the caching requirements. Possible values include: `None` (default), `ReadOnly`, `ReadWrite`.
* `disk_size_gb` - (Optional) Specifies the size of the disk in GB. This element is required when creating an empty disk. * `disk_size_gb` - (Optional) Specifies the size of the disk in GB. This element is required when creating an empty disk.
* `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value must be either `Standard_LRS` or * `managed_disk_type` - (Optional) Specifies the type of managed disk to create. Value must be either `Standard_LRS` or `Premium_LRS`.
`storage_profile_image_reference` supports the following: `storage_profile_image_reference` supports the following:

View File

@ -324,7 +324,7 @@
<li<%= sidebar_current("docs-azurerm-resource-virtualmachine") %>> <li<%= sidebar_current("docs-azurerm-resource-virtual") %>>
<a href="#">Virtual Machine Resources</a> <a href="#">Virtual Machine Resources</a>
<ul class="nav nav-visible"> <ul class="nav nav-visible">
@ -332,7 +332,7 @@
<a href="/docs/providers/azurerm/r/availability_set.html">azurerm_availability_set</a> <a href="/docs/providers/azurerm/r/availability_set.html">azurerm_availability_set</a>
</li> </li>
<li<%= sidebar_current("docs-azurerm-resource-virtualmachine") %>> <li<%= sidebar_current("docs-azurerm-resource-virtual-machine") %>>
<a href="/docs/providers/azurerm/r/virtual_machine.html">azurerm_virtual_machine</a> <a href="/docs/providers/azurerm/r/virtual_machine.html">azurerm_virtual_machine</a>
</li> </li>
@ -340,8 +340,8 @@
<a href="/docs/providers/azurerm/r/virtual_machine_extension.html">azurerm_virtual_machine_extension</a> <a href="/docs/providers/azurerm/r/virtual_machine_extension.html">azurerm_virtual_machine_extension</a>
</li> </li>
<li<%= sidebar_current("docs-azurerm-resource-virtualmachine-scalesets") %>> <li<%= sidebar_current("docs-azurerm-resource-virtualmachine-scale-set") %>>
<a href="/docs/providers/azurerm/r/virtual_machine_scale_sets.html">azurerm_virtual_machine_scale_set</a> <a href="/docs/providers/azurerm/r/virtual_machine_scale_set.html">azurerm_virtual_machine_scale_set</a>
</li> </li>
</ul> </ul>