From 55347c0e59b2f844e8e1db3204e6caa092e89b92 Mon Sep 17 00:00:00 2001
From: Pete Hodgson <git@thepete.net>
Date: Mon, 5 Jan 2015 21:44:18 -0800
Subject: [PATCH] Add docs for key_pair AWS resource

---
 .../providers/aws/r/key_pair.html.markdown    | 42 +++++++++++++++++++
 website/source/layouts/aws.erb                |  3 ++
 2 files changed, 45 insertions(+)
 create mode 100644 website/source/docs/providers/aws/r/key_pair.html.markdown

diff --git a/website/source/docs/providers/aws/r/key_pair.html.markdown b/website/source/docs/providers/aws/r/key_pair.html.markdown
new file mode 100644
index 0000000000..abd54ea111
--- /dev/null
+++ b/website/source/docs/providers/aws/r/key_pair.html.markdown
@@ -0,0 +1,42 @@
+---
+layout: "aws"
+page_title: "AWS: aws_key_pair"
+sidebar_current: "docs-aws-resource-key-pair"
+description: |-
+  Provides a Key Pair resource. Currently this supports importing an existing key pair but not creating a new key pair.
+---
+
+# aws\_key\_pair
+
+Provides an [EC2 key pair](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html) resource. A key pair is used to control login access to EC2 instances. 
+
+Currently this resource only supports importing an existing key pair, not creating a new key pair.
+
+When importing an existing key pair the public key material may be in any format supported by AWS. Supported formats (per the [AWS documentation](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#how-to-generate-your-own-key-and-import-it-to-aws)) are:
+
+* OpenSSH public key format (the format in ~/.ssh/authorized_keys)
+* Base64 encoded DER format
+* SSH public key file format as specified in RFC4716
+
+## Example Usage
+
+```
+resource "aws_key_pair" "deployer" {
+  key_name = "deployer-key" 
+  public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD3F6tyPEFEzV0LX3X8BsXdMsQz1x2cEikKDEY0aIj41qgxMCP/iteneqXSIFZBp5vizPvaoIR3Um9xK7PGoW8giupGn+EPuxIA4cDM4vzOqOkiMPhz5XK0whEjkVzTo4+S0puvDZuwIsdiW9mxhJc7tgBNL0cYlWSYVkz4G/fslNfRPW5mYAM49f4fhtxPb5ok4Q2Lg9dPKVHO/Bgeu5woMc7RY0p1ej6D4CKFE6lymSDJpW0YHX/wqE9+cfEauh7xZcG0q9t2ta6F6fmX0agvpFyZo8aFbXeUBr7osSCJNgvavWbM/06niWrOvYX2xwWdhXmXSrbX8ZbabVohBK41 email@example.com"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `key_name` - (Required) The name for the key pair.
+* `public_key` - (Required) The public key material. 
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `key_name` - The key pair name.
+* `fingerprint` - The MD5 public key fingerprint as specified in section 4 of RFC 4716.
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 5b1368ce19..d79f44580f 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -56,6 +56,9 @@
                     <li<%= sidebar_current("docs-aws-resource-network-acl") %>>
 					<a href="/docs/providers/aws/r/network_acl.html">aws_network_acl</a>
 					</li>
+                    <li<%= sidebar_current("docs-aws-resource-key-pair") %>>
+					<a href="/docs/providers/aws/r/key_pair.html">aws_key_pair</a>
+					</li>
 
                     <li<%= sidebar_current("docs-aws-resource-route-table|") %>>
 					<a href="/docs/providers/aws/r/route_table.html">aws_route_table</a>