From 1cfc27730fcb8b3dfb887c5181e943d60ab4d9f6 Mon Sep 17 00:00:00 2001 From: dnABic Date: Sun, 2 Oct 2016 23:54:16 +0200 Subject: [PATCH 1/3] Changing virtualization type in documentation for aws_instance --- .../docs/providers/aws/r/instance.html.markdown | 4 ++-- .../aws/r/launch_configuration.html.markdown | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index 26ac95dba..bb2aeedee 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -24,11 +24,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 } 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..7af758526 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 } @@ -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 } @@ -95,11 +95,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 } @@ -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 +``` From c1d6e36616a1f75c4b5b056237a5a3e4e14a2db3 Mon Sep 17 00:00:00 2001 From: dnABic Date: Sat, 15 Oct 2016 00:37:30 +0200 Subject: [PATCH 2/3] Changing t1 to t2 and us-east-1 to us-west-2 --- website/source/docs/providers/aws/r/instance.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index bb2aeedee..9b0f98393 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -15,9 +15,9 @@ 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" { @@ -35,7 +35,7 @@ data "aws_ami" "ubuntu" { resource "aws_instance" "web" { ami = "${data.aws_ami.ubuntu.id}" - instance_type = "t1.micro" + instance_type = "t2.micro" tags { Name = "HelloWorld" } From 4daf9eeef4c9b12cbb3c724fa97897897f0fe8c5 Mon Sep 17 00:00:00 2001 From: dnABic Date: Sat, 15 Oct 2016 01:02:44 +0200 Subject: [PATCH 3/3] Changing t1.micro to t2.micro and m4.large --- .../docs/providers/aws/r/launch_configuration.html.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 7af758526..dbcf3a9c9 100644 --- a/website/source/docs/providers/aws/r/launch_configuration.html.markdown +++ b/website/source/docs/providers/aws/r/launch_configuration.html.markdown @@ -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" } ``` @@ -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 @@ -106,7 +106,7 @@ data "aws_ami" "ubuntu" { 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