ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4046 from hashicorp/aws-spot-docs 

provider/aws: Update Instance/Spot docs for IP information
This commit is contained in:
Clint 2015-11-24 13:06:12 -06:00
parent bd23ab35bf d3f41320e8
commit 0ed3bdac7d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
website/source/docs/providers/aws/r/instance.html.markdown
View File

@ -130,10 +130,13 @@ The following attributes are exported:
* `availability_zone` - The availability zone of the instance. * `availability_zone` - The availability zone of the instance.
* `placement_group` - The placement group of the instance. * `placement_group` - The placement group of the instance.
* `key_name` - The key name of the instance * `key_name` - The key name of the instance
* `private_dns` - The Private DNS name of the instance * `public_dns` - The public DNS name assigned to the instance. For EC2-VPC, this
* `private_ip` - The private IP address. is only available if you've enabled DNS hostnames for your VPC
* `public_dns` - The public DNS name of the instance * `public_ip` - The public IP address assigned to the instance, if applicable.
* `public_ip` - The public IP address. * `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. * `security_groups` - The associated security groups.
* `vpc_security_group_ids` - The associated security groups in non-default VPC * `vpc_security_group_ids` - The associated security groups in non-default VPC
* `subnet_id` - The VPC subnet ID. * `subnet_id` - The VPC subnet ID.

7
website/source/docs/providers/aws/r/spot_instance_request.html.markdown
View File

@ -72,3 +72,10 @@ should only be used for informational purposes, not for resource dependencies:
of the Spot Instance Request. of the Spot Instance Request.
* `spot_instance_id` - The Instance ID (if any) that is currently fulfilling * `spot_instance_id` - The Instance ID (if any) that is currently fulfilling
the Spot Instance request. 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