From aef799057e2545f5ba07e4e1bf71f5d201ac17e7 Mon Sep 17 00:00:00 2001 From: Alek Storm Date: Thu, 21 Aug 2014 17:08:51 -0700 Subject: [PATCH] Update aws_route_table docs to clarify 'route' block usage --- website/source/docs/providers/aws/r/elb.html.markdown | 3 +-- .../source/docs/providers/aws/r/route_table.html.markdown | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/website/source/docs/providers/aws/r/elb.html.markdown b/website/source/docs/providers/aws/r/elb.html.markdown index 890c1c331..863cb916a 100644 --- a/website/source/docs/providers/aws/r/elb.html.markdown +++ b/website/source/docs/providers/aws/r/elb.html.markdown @@ -45,7 +45,7 @@ The following arguments are supported: * `subnets` - (Optional) A list of subnets to attach to the ELB. * `instances` - (Optional) A list of instance ids to place in the ELB pool. * `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: @@ -62,7 +62,6 @@ Health Check supports the following: * `interval` - (Required) The interval between checks. * `timeout` - (Required) The length of time before the check times out. - ## Attributes Reference The following attributes are exported: diff --git a/website/source/docs/providers/aws/r/route_table.html.markdown b/website/source/docs/providers/aws/r/route_table.html.markdown index efd1d3a8a..eaf45cb6d 100644 --- a/website/source/docs/providers/aws/r/route_table.html.markdown +++ b/website/source/docs/providers/aws/r/route_table.html.markdown @@ -15,6 +15,7 @@ resource "aws_route_table" "r" { vpc_id = "${aws_vpc.default.id}" route { 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: * `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: @@ -32,9 +33,12 @@ Each route supports the following: * `gateway_id` - (Optional) The Internet Gateway 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 The following attributes are exported: * `id` - The ID of the routing table -