From e59f39df5ffdfee913fd2322aab97f6e2351a2c5 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Tue, 15 Dec 2015 16:12:31 -0600 Subject: [PATCH] other m1/ami-1234 clean ups --- .../docs/providers/aws/r/instance.html.markdown | 8 ++++---- .../aws/r/launch_configuration.html.markdown | 12 ++++++------ website/source/index.html.erb | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index e9e835645..79e4d2207 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -14,11 +14,11 @@ and deleted. Instances also support [provisioning](/docs/provisioners/index.html ## Example Usage ``` -# Create a new instance of the ami-1234 on an m1.small node -# with an AWS Tag naming it "HelloWorld" +# Create a new instance of the `ami-d05e75b8` (Ubuntu 14.04) on an +# t2.micro node with an AWS Tag naming it "HelloWorld" resource "aws_instance" "web" { - ami = "ami-1234" - instance_type = "m1.small" + ami = "ami-d05e75b8" + instance_type = "t2.micro" tags { Name = "HelloWorld" } diff --git a/website/source/docs/providers/aws/r/launch_configuration.html.markdown b/website/source/docs/providers/aws/r/launch_configuration.html.markdown index 413f1b4a1..4f820b7f6 100644 --- a/website/source/docs/providers/aws/r/launch_configuration.html.markdown +++ b/website/source/docs/providers/aws/r/launch_configuration.html.markdown @@ -15,8 +15,8 @@ Provides a resource to create a new launch configuration, used for autoscaling g ``` resource "aws_launch_configuration" "as_conf" { name = "web_config" - image_id = "ami-1234" - instance_type = "m1.small" + ami = "ami-d05e75b8" + instance_type = "t2.micro" } ``` @@ -33,8 +33,8 @@ with `name_prefix`. Example: ``` resource "aws_launch_configuration" "as_conf" { name_prefix = "terraform-lc-example-" - image_id = "ami-1234" - instance_type = "m1.small" + ami = "ami-d05e75b8" + instance_type = "t2.micro" lifecycle { 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" { - image_id = "ami-1234" - instance_type = "m1.small" + ami = "ami-d05e75b8" + instance_type = "t2.micro" spot_price = "0.001" lifecycle { create_before_destroy = true diff --git a/website/source/index.html.erb b/website/source/index.html.erb index 92a6c3f17..353bb94fa 100644 --- a/website/source/index.html.erb +++ b/website/source/index.html.erb @@ -195,9 +195,9 @@

resource "aws_instance" "app" {

count = 5

-

-

ami = "ami-043a5034"

-

instance_type = "m1.small"

+

+

ami = "ami-d05e75b8"

+

instance_type = "t2.micro"

}