Merge pull request #9901 from AndHei/patch-3

Correct ambiguous aws_vpc_peering_connection docs
This commit is contained in:
James Nugent 2016-11-06 10:18:08 -06:00 committed by GitHub
commit 28a3cdc399

View File

@ -75,7 +75,7 @@ The following arguments are supported:
Defaults to the account ID the [AWS provider][1] is currently connected to. Defaults to the account ID the [AWS provider][1] is currently connected to.
* `peer_vpc_id` - (Required) The ID of the VPC with which you are creating the VPC Peering Connection. * `peer_vpc_id` - (Required) The ID of the VPC with which you are creating the VPC Peering Connection.
* `vpc_id` - (Required) The ID of the requester VPC. * `vpc_id` - (Required) The ID of the requester VPC.
* `auto_accept` - (Optional) Accept the peering (you need to be the owner of both VPCs). * `auto_accept` - (Optional) Accept the peering (both VPCs need to be in the same AWS account).
* `accepter` (Optional) - An optional configuration block that allows for [VPC Peering Connection] * `accepter` (Optional) - An optional configuration block that allows for [VPC Peering Connection]
(http://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide) options to be set for the VPC that accepts (http://docs.aws.amazon.com/AmazonVPC/latest/PeeringGuide) options to be set for the VPC that accepts
the peering connection (a maximum of one). the peering connection (a maximum of one).
@ -110,7 +110,9 @@ The following attributes are exported:
## Notes ## Notes
If you are not the owner of both VPCs, or do not enable the `auto_accept` attribute you will still AWS only supports VPC peering within the same AWS region.
If both VPCs are not in the same AWS account do not enable the `auto_accept` attribute. You will still
have to accept the VPC Peering Connection request manually using the AWS Management Console, AWS CLI, have to accept the VPC Peering Connection request manually using the AWS Management Console, AWS CLI,
through SDKs, etc. through SDKs, etc.