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

update CHANGELOG

This commit is contained in:
Mitchell Hashimoto 2015-06-25 09:07:11 -07:00
parent 02624118b3
commit 25fa84974b
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -43,6 +43,7 @@ IMPROVEMENTS:
without destroying first [GH-2191] without destroying first [GH-2191]
* provider/aws: Normalize `certificate_chain` in `aws_iam_servier_certificate` to * provider/aws: Normalize `certificate_chain` in `aws_iam_servier_certificate` to
prevent unnecessary replacement. [GH-2411] prevent unnecessary replacement. [GH-2411]
* provider/aws: `aws_instance` supports `monitoring' [GH-2489]
* provider/aws: `aws_launch_configuration` now supports `enable_monitoring` [GH-2410] * provider/aws: `aws_launch_configuration` now supports `enable_monitoring` [GH-2410]
* provider/aws: Show outputs after `terraform refresh` [GH-2347] * provider/aws: Show outputs after `terraform refresh` [GH-2347]
* provider/docker: `docker_container` has the `privileged` * provider/docker: `docker_container` has the `privileged`

4
builtin/providers/aws/resource_aws_instance.go
View File

@ -471,8 +471,8 @@ func resourceAwsInstanceRead(d *schema.ResourceData, meta interface{}) error {
d.Set("ebs_optimized", instance.EBSOptimized) d.Set("ebs_optimized", instance.EBSOptimized)
if instance.Monitoring != nil && instance.Monitoring.State != nil { if instance.Monitoring != nil && instance.Monitoring.State != nil {
monitoring_state := *instance.Monitoring.State monitoringState := *instance.Monitoring.State
d.Set("monitoring", monitoring_state == "enabled" || monitoring_state == "pending") d.Set("monitoring", monitoringState == "enabled" || monitoringState == "pending")
} }
d.Set("tags", tagsToMap(instance.Tags)) d.Set("tags", tagsToMap(instance.Tags))

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

@ -34,11 +34,11 @@ The following arguments are supported:
* `placement_group` - (Optional) The Placement Group to start the instance in. * `placement_group` - (Optional) The Placement Group to start the instance in.
* `ebs_optimized` - (Optional) If true, the launched EC2 instance will be * `ebs_optimized` - (Optional) If true, the launched EC2 instance will be
EBS-optimized. EBS-optimized.
* `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled.
* `disable_api_termination` - (Optional) If true, enables [EC2 Instance * `disable_api_termination` - (Optional) If true, enables [EC2 Instance
Termination Protection](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.html#Using_ChangingDisableAPITermination) Termination Protection](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.html#Using_ChangingDisableAPITermination)
* `instance_type` - (Required) The type of instance to start * `instance_type` - (Required) The type of instance to start
* `key_name` - (Optional) The key name to use for the instance. * `key_name` - (Optional) The key name to use for the instance.
* `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0)
* `security_groups` - (Optional) A list of security group names to associate with. * `security_groups` - (Optional) A list of security group names to associate with.
If you are within a non-default VPC, you'll need to use `vpc_security_group_ids` instead. If you are within a non-default VPC, you'll need to use `vpc_security_group_ids` instead.
* `vpc_security_group_ids` - (Optional) A list of security group IDs to associate with. * `vpc_security_group_ids` - (Optional) A list of security group IDs to associate with.