Merge pull request #13 from unifio/wc-updates

Updated to Terraform 0.8 compatibile ASG module

Author: blakeneyops

CHANGELOG.md

@@ -7,6 +7,16 @@
 - Fix the 4 subnet fixed mapping
 - Fill in some examples
 
+## 0.0.10
+
+#### IMPROVEMENTS:
+- Terraform 0.8.x compatibility updates.
+
+## 0.0.9
+
+#### IMPROVEMENTS:
+- Added AMIs in Oregon (us-west-2)
+
 ## 0.0.8
 
 #### IMPROVEMENTS:

certs/main.tf

@@ -197,29 +197,28 @@ data "template_file" "user_data" {
 
 ## Creates auto scaling cluster
 module "cluster" {
-  source = "github.com/unifio/terraform-aws-asg?ref=v0.2.0//group"
+  source = "github.com/unifio/terraform-aws-asg?ref=v0.3.0//group"
 
   # Resource tags
   stack_item_label    = "${var.stack_item_label}"
   stack_item_fullname = "${var.stack_item_fullname}"
 
   # VPC parameters
   vpc_id  = "${var.vpc_id}"
-  subnets = "${var.subnets}"
-  region  = "${var.region}"
+  subnets = ["${var.subnets}"]
 
   # LC parameters
-  ami              = "${coalesce(var.ami_custom, lookup(var.ami_region_lookup, var.region))}"
-  instance_type    = "${var.instance_type}"
-  instance_profile = "${aws_iam_instance_profile.profile.id}"
-  user_data        = "${data.template_file.user_data.rendered}"
-  key_name         = "${var.key_name}"
-  ebs_optimized    = false
+  ami                           = "${coalesce(var.ami_custom, lookup(var.ami_region_lookup, var.region))}"
+  instance_based_naming_enabled = "${var.instance_based_naming_enabled}"
+  instance_type                 = "${var.instance_type}"
+  instance_profile              = "${aws_iam_instance_profile.profile.id}"
+  user_data                     = "${data.template_file.user_data.rendered}"
+  key_name                      = "${var.key_name}"
 
   # ASG parameters
   max_size         = 2
   min_size         = 1
   hc_grace_period  = 300
   min_elb_capacity = 1
-  load_balancers   = "${aws_elb.elb.id}"
+  load_balancers   = ["${aws_elb.elb.id}"]
 }

certs/variables.tf

@@ -45,6 +45,12 @@ variable "ami_region_lookup" {
   }
 }
 
+variable "instance_based_naming_enabled" {
+  type        = "string"
+  description = "Flag to enable instance-id based name tagging."
+  default     = ""
+}
+
 variable "instance_type" {
   type        = "string"
   description = "EC2 instance type to associate with the launch configuration."