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

Merge pull request #4330 from hashicorp/docs-update-ami-type 

Update doc to use valid AMI and t2.micro instance types
This commit is contained in:
Clint 2015-12-15 16:20:47 -06:00
parent 64bded6269 35a69fd322
commit 294d59cee4
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/source/docs/configuration/override.html.md
View File

@ -37,7 +37,7 @@ If you have a Terraform configuration `example.tf` with the contents:
``` ```
resource "aws_instance" "web" { resource "aws_instance" "web" {
ami = "ami-1234567" ami = "ami-d05e75b8"
} }
``` ```

4
website/source/docs/configuration/resources.html.md
View File

@ -25,8 +25,8 @@ A resource configuration looks like the following:
``` ```
resource "aws_instance" "web" { resource "aws_instance" "web" {
ami = "ami-123456" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
} }
``` ```

6
website/source/docs/modules/usage.html.markdown
View File

@ -87,9 +87,9 @@ For example:
``` ```
resource "aws_instance" "client" { resource "aws_instance" "client" {
ami = "ami-123456" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
availability_zone = "${module.consul.server_availability_zone}" availability_zone = "${module.consul.server_availability_zone}"
} }
``` ```

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

@ -14,11 +14,11 @@ and deleted. Instances also support [provisioning](/docs/provisioners/index.html
## Example Usage ## Example Usage
``` ```
# Create a new instance of the ami-1234 on an m1.small node # Create a new instance of the `ami-d05e75b8` (Ubuntu 14.04) on an
# with an AWS Tag naming it "HelloWorld" # t2.micro node with an AWS Tag naming it "HelloWorld"
resource "aws_instance" "web" { resource "aws_instance" "web" {
ami = "ami-1234" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
tags { tags {
Name = "HelloWorld" Name = "HelloWorld"
} }

12
website/source/docs/providers/aws/r/launch_configuration.html.markdown
View File

@ -15,8 +15,8 @@ Provides a resource to create a new launch configuration, used for autoscaling g
``` ```
resource "aws_launch_configuration" "as_conf" { resource "aws_launch_configuration" "as_conf" {
name = "web_config" name = "web_config"
image_id = "ami-1234" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
} }
``` ```
@ -33,8 +33,8 @@ with `name_prefix`. Example:
``` ```
resource "aws_launch_configuration" "as_conf" { resource "aws_launch_configuration" "as_conf" {
name_prefix = "terraform-lc-example-" name_prefix = "terraform-lc-example-"
image_id = "ami-1234" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
lifecycle { lifecycle {
create_before_destroy = true create_before_destroy = true
@ -66,8 +66,8 @@ for more information or how to launch [Spot Instances][3] with Terraform.
``` ```
resource "aws_launch_configuration" "as_conf" { resource "aws_launch_configuration" "as_conf" {
image_id = "ami-1234" ami = "ami-d05e75b8"
instance_type = "m1.small" instance_type = "t2.micro"
spot_price = "0.001" spot_price = "0.001"
lifecycle { lifecycle {
create_before_destroy = true create_before_destroy = true

4
website/source/index.html.erb
View File

@ -196,8 +196,8 @@
<p>resource <span class="txt-spe">"aws_instance"</span> <span class="txt-str">"app"</span> {</p> <p>resource <span class="txt-spe">"aws_instance"</span> <span class="txt-str">"app"</span> {</p>
<p> count = <span class="txt-int">5</span></p> <p> count = <span class="txt-int">5</span></p>
<p> </p> <p> </p>
<p> ami = <span class="txt-str">"ami-043a5034"</span></p> <p> ami = <span class="txt-str">"ami-d05e75b8"</span></p>
<p> instance_type = <span class="txt-str">"m1.small"</span></p> <p> instance_type = <span class="txt-str">"t2.micro"</span></p>
<p>}</p> <p>}</p>
</div> </div>
</div> </div>