From b923e879bd66b88b05e4a17e028a12c65b495155 Mon Sep 17 00:00:00 2001 From: Daniel Bryant Date: Mon, 28 Dec 2015 12:52:52 +0000 Subject: [PATCH] Correct README.md and add missing variable. Correct README.md execution instructions var name and use 'key_name' var as intended in 'aws_key_pair' resource --- examples/aws-two-tier/README.md | 8 ++++++-- examples/aws-two-tier/main.tf | 2 +- examples/aws-two-tier/variables.tf | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/examples/aws-two-tier/README.md b/examples/aws-two-tier/README.md index dcdf7d1c4..3c0e54bc0 100644 --- a/examples/aws-two-tier/README.md +++ b/examples/aws-two-tier/README.md @@ -10,6 +10,10 @@ getting your application onto the servers. However, you could do so either via management tool, or by pre-baking configured AMIs with [Packer](http://www.packer.io). +This example will also create a new EC2 Key Pair in the specified AWS Region. +The key name and path to the public key must be specified via the +terraform command vars. + After you run `terraform apply` on this configuration, it will automatically output the DNS address of the ELB. After your instance registers, this should respond with the default nginx web page. @@ -22,11 +26,11 @@ Run with a command like this: ``` terraform apply -var 'key_name={your_aws_key_name}' \ - -var 'key_path={location_of_your_key_in_your_local_machine}'` + -var 'public_key_path={location_of_your_key_in_your_local_machine}'` ``` For example: ``` -terraform apply -var 'key_name=terraform' -var 'key_path=/Users/jsmith/.ssh/terraform.pem' +terraform apply -var 'key_name=terraform' -var 'public_key_path=/Users/jsmith/.ssh/terraform.pub' ``` diff --git a/examples/aws-two-tier/main.tf b/examples/aws-two-tier/main.tf index 8b98d979c..ab6107149 100644 --- a/examples/aws-two-tier/main.tf +++ b/examples/aws-two-tier/main.tf @@ -100,7 +100,7 @@ resource "aws_elb" "web" { } resource "aws_key_pair" "auth" { - key_name = "tf-aws-two-tier-example" + key_name = "${var.key_name}" public_key = "${file(var.public_key_path)}" } diff --git a/examples/aws-two-tier/variables.tf b/examples/aws-two-tier/variables.tf index 1321fcf1b..a5d6adc64 100644 --- a/examples/aws-two-tier/variables.tf +++ b/examples/aws-two-tier/variables.tf @@ -4,10 +4,14 @@ Path to the SSH public key to be used for authentication. Ensure this keypair is added to your local SSH agent so provisioners can connect. -Example: ~/.ssh/id_rsa.pub +Example: ~/.ssh/terraform.pub DESCRIPTION } +variable "key_name" { + description = "Desired name of AWS key pair" +} + variable "aws_region" { description = "AWS region to launch servers." default = "us-west-2"