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

Merge pull request #216 from alekstorm/docs-route-table-rules 

website: Update aws_route_table docs to clarify 'route' block usage
This commit is contained in:
Mitchell Hashimoto 2014-08-21 17:11:31 -07:00
parent da2e221628 aef799057e
commit 58f6cadbdc
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
website/source/docs/providers/aws/r/elb.html.markdown
View File

@ -45,7 +45,7 @@ The following arguments are supported:
* `subnets` - (Optional) A list of subnets to attach to the ELB. * `subnets` - (Optional) A list of subnets to attach to the ELB.
* `instances` - (Optional) A list of instance ids to place in the ELB pool. * `instances` - (Optional) A list of instance ids to place in the ELB pool.
* `listener` - (Required) A list of listener blocks. Listeners documented below. * `listener` - (Required) A list of listener blocks. Listeners documented below.
* `health_check` - (Required) A health_check block. Health Check documented below. * `health_check` - (Optional) A health_check block. Health Check documented below.
Listeners support the following: Listeners support the following:
@ -62,7 +62,6 @@ Health Check supports the following:
* `interval` - (Required) The interval between checks. * `interval` - (Required) The interval between checks.
* `timeout` - (Required) The length of time before the check times out. * `timeout` - (Required) The length of time before the check times out.
## Attributes Reference ## Attributes Reference
The following attributes are exported: The following attributes are exported:

8
website/source/docs/providers/aws/r/route_table.html.markdown
View File

@ -15,6 +15,7 @@ resource "aws_route_table" "r" {
vpc_id = "${aws_vpc.default.id}" vpc_id = "${aws_vpc.default.id}"
route { route {
cidr_block = "10.0.1.0/24" cidr_block = "10.0.1.0/24"
gateway_id = "${aws_internet_gateway.main.id}"
} }
} }
``` ```
@ -24,7 +25,7 @@ resource "aws_route_table" "r" {
The following arguments are supported: The following arguments are supported:
* `vpc_id` - (Required) The ID of the routing table. * `vpc_id` - (Required) The ID of the routing table.
* `route` - (Required) A list of route objects. Their keys are documented below. * `route` - (Optional) A list of route objects. Their keys are documented below.
Each route supports the following: Each route supports the following:
@ -32,9 +33,12 @@ Each route supports the following:
* `gateway_id` - (Optional) The Internet Gateway ID. * `gateway_id` - (Optional) The Internet Gateway ID.
* `instance_id` - (Optional) The EC2 instance ID. * `instance_id` - (Optional) The EC2 instance ID.
Each route must contain either a `gateway_id` or an `instance_id`. Note that the
default route, mapping the VPC's CIDR block to "local", is created implicitly and
cannot be specified.
## Attributes Reference ## Attributes Reference
The following attributes are exported: The following attributes are exported:
* `id` - The ID of the routing table * `id` - The ID of the routing table