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

Merge pull request #319 from lflux/aws-instance-iam-support 

Add IAM Instance profile support to AWS instance provider
This commit is contained in:
Mitchell Hashimoto 2014-09-27 12:43:18 -07:00
parent 1c73f4e703 9f91c4e8c3
commit 5da86c1279
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,6 +117,11 @@ func resourceAwsInstance() *schema.Resource {
Type: schema.TypeBool, Type: schema.TypeBool,
Optional: true, Optional: true,
}, },
"iam_instance_profile": &schema.Schema{
Type: schema.TypeString,
ForceNew: true,
Optional: true,
},
}, },
} }
} }
@ -147,6 +152,7 @@ func resourceAwsInstanceCreate(d *schema.ResourceData, meta interface{}) error {
AssociatePublicIpAddress: associatePublicIPAddress, AssociatePublicIpAddress: associatePublicIPAddress,
UserData: []byte(userData), UserData: []byte(userData),
EbsOptimized: d.Get("ebs_optimized").(bool), EbsOptimized: d.Get("ebs_optimized").(bool),
IamInstanceProfile: d.Get("iam_instance_profile").(string),
} }
if v := d.Get("security_groups"); v != nil { if v := d.Get("security_groups"); v != nil {

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

@ -39,6 +39,8 @@ The following arguments are supported:
* `source_dest_check` - (Optional) Controls if traffic is routed to the instance when * `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 true. the destination address does not match the instance. Used for NAT or VPNs. Defaults true.
* `user_data` - (Optional) The user data to provide when launching the instance. * `user_data` - (Optional) The user data to provide when launching the instance.
* `iam_instance_profile` - (Optional) The IAM Instance Profile to
launch the instance with.
## Attributes Reference ## Attributes Reference