From a292625846b399fe7a40f36e177121306875d706 Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Thu, 21 Aug 2014 17:17:50 -0700
Subject: [PATCH] website: private IP docs

---
 CHANGELOG.md                                               | 1 +
 website/source/docs/providers/aws/r/instance.html.markdown | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c375c9258..9fa3edadd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ IMPROVEMENTS:
   * providers/aws: Security group rules can be updated without a
       destroy/create.
   * providers/aws: You can enable and disable dns settings for VPCs. [GH-172]
+  * providers/aws: Can specify a private IP address for `aws_instance` [GH-217]
 
 BUG FIXES:
 
diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown
index a700f9320..9b2efd591 100644
--- a/website/source/docs/providers/aws/r/instance.html.markdown
+++ b/website/source/docs/providers/aws/r/instance.html.markdown
@@ -32,6 +32,8 @@ The following arguments are supported:
    for EC2, use the security group name.
 * `subnet_id` - (Optional) The VPC Subnet ID to launch in.
 * `associate_public_ip_address` - (Optional) Associate a public ip address with an instance in a VPC.
+* `proviate_ip` - (Optional) Private IP address to associate with the
+     instance in a VPC.
 * `source_dest_check` - (Optional) Controls if traffic is routed to the instance when
   the destination address does not match the instance. Used for NAT or VPNs. Defaults false.
 * `user_data` - (Optional) The user data to provide when launching the instance.