From d3f41320e81f97cb4ae76886326b4e0e804754ff Mon Sep 17 00:00:00 2001 From: clint shryock Date: Tue, 24 Nov 2015 10:10:12 -0600 Subject: [PATCH] provider/aws: Update Instance/Spot docs for IP information --- .../docs/providers/aws/r/instance.html.markdown | 11 +++++++---- .../aws/r/spot_instance_request.html.markdown | 7 +++++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index ac4b342fb..1a27bb121 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -130,10 +130,13 @@ The following attributes are exported: * `availability_zone` - The availability zone of the instance. * `placement_group` - The placement group of the instance. * `key_name` - The key name of the instance -* `private_dns` - The Private DNS name of the instance -* `private_ip` - The private IP address. -* `public_dns` - The public DNS name of the instance -* `public_ip` - The public IP address. +* `public_dns` - The public DNS name assigned to the instance. For EC2-VPC, this + is only available if you've enabled DNS hostnames for your VPC +* `public_ip` - The public IP address assigned to the instance, if applicable. +* `private_dns` - The private DNS name assigned to the instance. Can only be + used inside the Amazon EC2, and only available if you've enabled DNS hostnames + for your VPC +* `private_ip` - The private IP address assigned to the instance * `security_groups` - The associated security groups. * `vpc_security_group_ids` - The associated security groups in non-default VPC * `subnet_id` - The VPC subnet ID. diff --git a/website/source/docs/providers/aws/r/spot_instance_request.html.markdown b/website/source/docs/providers/aws/r/spot_instance_request.html.markdown index 5ca6daf9f..453d9a18e 100644 --- a/website/source/docs/providers/aws/r/spot_instance_request.html.markdown +++ b/website/source/docs/providers/aws/r/spot_instance_request.html.markdown @@ -72,3 +72,10 @@ should only be used for informational purposes, not for resource dependencies: of the Spot Instance Request. * `spot_instance_id` - The Instance ID (if any) that is currently fulfilling the Spot Instance request. +* `public_dns` - The public DNS name assigned to the instance. For EC2-VPC, this + is only available if you've enabled DNS hostnames for your VPC +* `public_ip` - The public IP address assigned to the instance, if applicable. +* `private_dns` - The private DNS name assigned to the instance. Can only be + used inside the Amazon EC2, and only available if you've enabled DNS hostnames + for your VPC +* `private_ip` - The private IP address assigned to the instance