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

Merge pull request #12355 from hashicorp/b-alb 

website: clarify elb vs alb
This commit is contained in:
Mitchell Hashimoto 2017-03-01 14:53:10 -08:00 committed by GitHub
parent 320e99f26e a4c56b5056
commit 7a366c58d2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
website/source/docs/providers/aws/r/alb.html.markdown
View File

@ -10,6 +10,10 @@ description: |-
Provides an Application Load Balancer resource.
The official AWS CLI calls this "elbv2" while their documentation calls it
an Application Load Balancer. Terraform uses "ALB" but they mean the same
thing.
## Example Usage
```

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

@ -8,7 +8,9 @@ description: |-
# aws\_elb
Provides an Elastic Load Balancer resource.
Provides an Elastic Load Balancer resource, also known as a "Classic
Load Balancer" after the release of
[Application Load Balancers](/docs/providers/aws/r/alb.html).
~> **NOTE on ELB Instances and ELB Attachments:** Terraform currently
provides both a standalone [ELB Attachment resource](elb_attachment.html)
@ -16,6 +18,7 @@ provides both a standalone [ELB Attachment resource](elb_attachment.html)
`instances` defined in-line. At this time you cannot use an ELB with in-line
instances in conjunction with a ELB Attachment resources. Doing so will cause a
conflict and will overwrite attachments.
## Example Usage
```