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

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

Merged
merged 1 commit into from
May 30, 2017
Merged

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

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion website/source/docs/providers/azurerm/r/virtual_machine.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
layout: "azurerm"
page_title: "Azure Resource Manager: azurerm_virtual_machine"
sidebar_current: "docs-azurerm-resource-virtualmachine"
sidebar_current: "docs-azurerm-resource-virtual-machine"
description: |-
Create a Virtual Machine.
---
Expand Down
21 changes: 9 additions & 12 deletions .../virtual_machine_scale_sets.html.markdown → ...r/virtual_machine_scale_set.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
layout: "azurerm"
page_title: "Azure Resource Manager: azurerm_virtual_machine_scale_sets"
sidebar_current: "docs-azurerm-resource-virtualmachine-scale-sets"
page_title: "Azure Resource Manager: azurerm_virtual_machine_scale_set"
sidebar_current: "docs-azurerm-resource-virtualmachine-scale-set"
description: |-
Create a Virtual Machine scale set.
---

# azurerm\_virtual\_machine\_scale\_sets
# azurerm\_virtual\_machine\_scale\_set

Create a virtual machine scale set.

Expand Down Expand Up @@ -108,7 +108,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {

## Example Usage with Managed Disks

```
```hcl
resource "azurerm_resource_group" "test" {
name = "acctestrg"
location = "West US 2"
Expand Down Expand Up @@ -189,7 +189,7 @@ resource "azurerm_virtual_machine_scale_set" "test" {
}

storage_profile_os_disk {
name = "myosdisk"
name = ""
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Standard_LRS"
Expand Down Expand Up @@ -239,10 +239,8 @@ resource "azurerm_virtual_machine_scale_set" "test" {

The following arguments are supported:

* `name` - (Required) Specifies the name of the virtual machine scale set resource. 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.
* `name` - (Required) Specifies the name of the virtual machine scale set resource. 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.
* `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`.
Expand Down Expand Up @@ -327,7 +325,7 @@ The following arguments are supported:

`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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Related: I've opened issue #14932 to discuss making this field Optional, so this is no longer needed

* `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.
* `create_option` - (Required) Specifies how the virtual machine should be created. The only possible option is `FromImage`.
Expand All @@ -340,11 +338,10 @@ The following arguments are supported:
`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.
`Premium_LRS`.
* `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`.
* `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:

Expand Down
8 changes: 4 additions & 4 deletions website/source/layouts/azurerm.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,24 +324,24 @@



<li<%= sidebar_current("docs-azurerm-resource-virtualmachine") %>>
<li<%= sidebar_current("docs-azurerm-resource-virtual") %>>
<a href="#">Virtual Machine Resources</a>
<ul class="nav nav-visible">

<li<%= sidebar_current("docs-azurerm-resource-virtualmachine-availability-set") %>>
<a href="/docs/providers/azurerm/r/availability_set.html">azurerm_availability_set</a>
</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>
</li>

<li<%= sidebar_current("docs-azurerm-resource-virtualmachine-extension") %>>
<a href="/docs/providers/azurerm/r/virtual_machine_extension.html">azurerm_virtual_machine_extension</a>
</li>

<li<%= sidebar_current("docs-azurerm-resource-virtualmachine-scalesets") %>>
<a href="/docs/providers/azurerm/r/virtual_machine_scale_sets.html">azurerm_virtual_machine_scale_set</a>
<li<%= sidebar_current("docs-azurerm-resource-virtualmachine-scale-set") %>>
<a href="/docs/providers/azurerm/r/virtual_machine_scale_set.html">azurerm_virtual_machine_scale_set</a>
</li>

</ul>
Expand Down