Merge branch 'release/1.0.0'

Author: hectcastro

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0
+
+- Renames `cloud_config` to `cloud_config_content`.
+- Adds `cloud_config_content_type` to supply the content type for the `cloud-config` content.
+
 ## 0.8.1
 
 - Use `owners` argument for `aws_ami` instead of owner-alias filter.

README.md

@@ -7,7 +7,7 @@ A Terraform module to create an Amazon Web Services (AWS) EC2 Container Service
 ```hcl
 data "template_file" "container_instance_cloud_config" {
   template = "${file("cloud-config/container-instance.yml.tpl")}"
- 
+
   vars {
     environment = "${var.environment}"
   }
@@ -58,7 +58,8 @@ module "container_service_cluster" {
 - `root_block_device_size` - Instance root block device size in gigabytes (default: `8`)
 - `instance_type` - Instance type for cluster instances (default: `t2.micro`)
 - `key_name` - EC2 Key pair name
-- `cloud_config` - `cloud-config` user data supplied to launch configuration for cluster nodes
+- `cloud_config_content` - user data supplied to launch configuration for cluster nodes
+- `cloud_config_content_type` - the type of configuration being passed in as user data, see [EC2 user guide](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AmazonLinuxAMIBasics.html#CloudInit) for a list of possible types (default: `text/cloud-config`)
 - `health_check_grace_period` - Time in seconds after container instance comes into service before checking health (default: `600`)
 - `desired_capacity` - Number of EC2 instances that should be running in cluster (default: `1`)
 - `min_size` - Minimum number of EC2 instances in cluster (default: `0`)
@@ -92,4 +93,4 @@ module "container_service_cluster" {
 - `ecs_autoscale_role_name` - Name of IAM role for use with ECS service autoscaling
 - `ecs_service_role_arn` - ARN of IAM role for use with ECS services
 - `ecs_autoscale_role_arn` - ARN of IAM role for use with ECS service autoscaling
-- `container_instance_ecs_for_ec2_service_role_arn` - ARN of IAM role associated with EC2 container instances
+- `container_instance_ecs_for_ec2_service_role_arn` - ARN of IAM role associated with EC2 container instances

main.tf

@@ -113,8 +113,8 @@ data "template_cloudinit_config" "container_instance_cloud_config" {
   }
 
   part {
-    content_type = "text/cloud-config"
-    content      = "${var.cloud_config}"
+    content_type = "${var.cloud_config_content_type}"
+    content      = "${var.cloud_config_content}"
   }
 }
 
@@ -144,13 +144,8 @@ data "aws_ami" "ecs_ami" {
 }
 
 data "aws_ami" "user_ami" {
-  count       = "${var.lookup_latest_ami ? 0 : 1}"
-  most_recent = true
-
-  filter {
-    name   = "owner-alias"
-    values = ["${var.ami_owners}"]
-  }
+  count  = "${var.lookup_latest_ami ? 0 : 1}"
+  owners = ["${var.ami_owners}"]
 
   filter {
     name   = "image-id"

variables.tf

@@ -34,7 +34,11 @@ variable "instance_type" {
 
 variable "key_name" {}
 
-variable "cloud_config" {}
+variable "cloud_config_content" {}
+
+variable "cloud_config_content_type" {
+  default = "text/cloud-config"
+}
 
 variable "health_check_grace_period" {
   default = "600"