diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index 9302d9334..cd331da91 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -15,27 +15,27 @@ and deleted. Instances also support [provisioning](/docs/provisioners/index.html ``` # Create a new instance of the latest Ubuntu 14.04 on an -# t1.micro node with an AWS Tag naming it "HelloWorld" +# t2.micro node with an AWS Tag naming it "HelloWorld" provider "aws" { - region = "us-east-1" + region = "us-west-2" } data "aws_ami" "ubuntu" { most_recent = true filter { name = "name" - values = ["ubuntu/images/ebs/ubuntu-trusty-14.04-amd64-server-*"] + values = ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*"] } filter { name = "virtualization-type" - values = ["paravirtual"] + values = ["hvm"] } owners = ["099720109477"] # Canonical } resource "aws_instance" "web" { ami = "${data.aws_ami.ubuntu.id}" - instance_type = "t1.micro" + 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 940538b0b..dbcf3a9c9 100644 --- a/website/source/docs/providers/aws/r/launch_configuration.html.markdown +++ b/website/source/docs/providers/aws/r/launch_configuration.html.markdown @@ -17,11 +17,11 @@ data "aws_ami" "ubuntu" { most_recent = true filter { name = "name" - values = ["ubuntu/images/ebs/ubuntu-trusty-14.04-amd64-server-*"] + values = ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*"] } filter { name = "virtualization-type" - values = ["paravirtual"] + values = ["hvm"] } owners = ["099720109477"] # Canonical } @@ -29,7 +29,7 @@ data "aws_ami" "ubuntu" { resource "aws_launch_configuration" "as_conf" { name = "web_config" image_id = "${data.aws_ami.ubuntu.id}" - instance_type = "t1.micro" + instance_type = "t2.micro" } ``` @@ -48,11 +48,11 @@ data "aws_ami" "ubuntu" { most_recent = true filter { name = "name" - values = ["ubuntu/images/ebs/ubuntu-trusty-14.04-amd64-server-*"] + values = ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*"] } filter { name = "virtualization-type" - values = ["paravirtual"] + values = ["hvm"] } owners = ["099720109477"] # Canonical } @@ -60,7 +60,7 @@ data "aws_ami" "ubuntu" { resource "aws_launch_configuration" "as_conf" { name_prefix = "terraform-lc-example-" image_id = "${data.aws_ami.ubuntu.id}" - instance_type = "t1.micro" + instance_type = "t2.micro" lifecycle { create_before_destroy = true @@ -95,18 +95,18 @@ data "aws_ami" "ubuntu" { most_recent = true filter { name = "name" - values = ["ubuntu/images/ebs/ubuntu-trusty-14.04-amd64-server-*"] + values = ["ubuntu/images/hvm-ssd/ubuntu-trusty-14.04-amd64-server-*"] } filter { name = "virtualization-type" - values = ["paravirtual"] + values = ["hvm"] } owners = ["099720109477"] # Canonical } resource "aws_launch_configuration" "as_conf" { image_id = "${data.aws_ami.ubuntu.id}" - instance_type = "t1.micro" + instance_type = "m4.large" spot_price = "0.001" lifecycle { create_before_destroy = true @@ -221,4 +221,4 @@ Launch configurations can be imported using the `name`, e.g. ``` $ terraform import aws_launch_configuration.as_conf terraform-lg-123456 -``` \ No newline at end of file +```