From c7088eb82a2e0d1f19e67ec9a69cdab5aa9c4f76 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 8 Oct 2014 10:54:34 -0700 Subject: [PATCH] website: update docs for GH-371 --- CHANGELOG.md | 2 ++ website/source/docs/providers/aws/r/launch_config.html.markdown | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3344be433..30fe6ed23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,8 @@ IMPROVEMENTS: * providers/aws: Add `ssl_certificate_id` for ELB listeners. [GH-350] * providers/aws: Add `self` option for security groups for ingress rules with self as source. [GH-303] + * providers/aws: Add `iam_instance_profile` option to + `aws_launch_configuration`. [GH-371] * providers/google: Support `target_tags` for firewalls. [GH-324] * providers/google: `google_compute_instance` supports `can_ip_forward` [GH-375] * providers/google: `google_compute_disk` supports `type` to support disks diff --git a/website/source/docs/providers/aws/r/launch_config.html.markdown b/website/source/docs/providers/aws/r/launch_config.html.markdown index 3d6ff8373..c681747e8 100644 --- a/website/source/docs/providers/aws/r/launch_config.html.markdown +++ b/website/source/docs/providers/aws/r/launch_config.html.markdown @@ -25,6 +25,8 @@ The following arguments are supported: * `name` - (Required) The name of the launch configuration. * `image_id` - (Required) The EC2 image ID to launch. * `instance_type` - (Required) The size of instance to launch. +* `iam_instance_profile` - (Optional) The IAM instance profile to associate + with launched instances. * `key_name` - (Optional) The key name that should be used for the instance. * `security_groups` - (Optional) A list of associated security group IDS. * `user_data` - (Optional) The user data to provide when launching the instance.