Merge pull request #4451 from daniel-bryant-uk/fix_aws_two_tier_example

Correct 'aws-two-tier' example README.md and add missing variable

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'
 ```

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)}"
 }
 

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"