ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7488 from DevOpsFu/master 

Corrected some ARM documentation
This commit is contained in:
James Nugent 2016-07-05 10:48:34 +01:00 committed by GitHub
parent e0ea516360 f04d8befd5
commit 8bf871dae2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
website/source/docs/providers/azurerm/r/template_deployment.html.markdown
View File

@ -83,10 +83,13 @@ The following arguments are supported:
* `name` - (Required) Specifies the name of the template deployment. Changing this forces a * `name` - (Required) Specifies the name of the template deployment. 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 * `resource_group_name` - (Required) The name of the resource group in which to
create the template deployment. create the template deployment.
* `deployment_mode` - (Required) Specifies the mode that is used to deploy resources. This value could be either `Incremental` or `Complete`.
Note that you will almost *always* want this to be set to `Incremental` otherwise the deployment will destroy all infrastructure not
specified within the template, and Terraform will not be aware of this.
* `template_body` - (Optional) Specifies the JSON definition for the template. * `template_body` - (Optional) Specifies the JSON definition for the template.
* `parameters` - (Optional) Specifies the name and value pairs that define the deployment parameters for the template. * `parameters` - (Optional) Specifies the name and value pairs that define the deployment parameters for the template.
* `deployment_mode` - (Optional) Specifies the mode that is used to deploy resources. This value could be either `Incremental` or `Complete`.
## Attributes Reference ## Attributes Reference

4
website/source/docs/providers/azurerm/r/virtual_network.html.markdown
View File

@ -19,6 +19,7 @@ resource "azurerm_virtual_network" "test" {
resource_group_name = "${azurerm_resource_group.test.name}" resource_group_name = "${azurerm_resource_group.test.name}"
address_space = ["10.0.0.0/16"] address_space = ["10.0.0.0/16"]
location = "West US" location = "West US"
dns_servers = ["10.0.0.4", "10.0.0.5"]
subnet { subnet {
name = "subnet1" name = "subnet1"
@ -58,8 +59,7 @@ The following arguments are supported:
* `location` - (Required) The location/region where the virtual network is * `location` - (Required) The location/region where the virtual network is
created. Changing this forces a new resource to be created. created. Changing this forces a new resource to be created.
* `dns_servers` - (Optional) List of names of DNS servers previously registered * `dns_servers` - (Optional) List of IP addresses of DNS servers
on Azure.
* `subnet` - (Optional) Can be specified multiple times to define multiple * `subnet` - (Optional) Can be specified multiple times to define multiple
subnets. Each `subnet` block supports fields documented below. subnets. Each `subnet` block supports fields documented below.