Merge pull request #7 from unifio/yl-wip

Terraform 0.7.x compatibility updates

Author: yuhunglin

CHANGELOG.md

@@ -7,6 +7,13 @@
 - Fix the 4 subnet fixed mapping
 - Fill in some examples
 
+## 0.0.8
+
+#### IMPROVEMENTS:
+- [#6]: (certs) - Simplify logic when specifying a custom ami.
+- [#7]: (generate-certs) - Terraform 0.7.x compatibility updates.
+- [#7]: (certs) - Terraform 0.7.x compatibility updates.
+
 ## 0.0.7
 
 #### BUG FIXES:

Rakefile

@@ -21,7 +21,7 @@ task :verify do
 
   vars = []
   inputs.each() do |var, value|
-    vars.push("-var #{var}=\"#{value}\"")
+    vars.push("-var '#{var}=\"#{value}\"'")
   end
 
   ['server','cert-gen'].each do |stack|

certs/main.tf

@@ -184,7 +184,7 @@ resource "aws_security_group_rule" "cluster_allow_icmp_in" {
 }
 
 ## Creates instance user data
-resource "template_file" "user_data" {
+data "template_file" "user_data" {
   template = "${file("${path.module}/templates/user_data.tpl")}"
 
   vars {
@@ -193,10 +193,6 @@ resource "template_file" "user_data" {
     s3_bucket_prefix = "${var.s3_bucket_prefix}"
     route_cidrs      = "${var.route_cidrs}"
   }
-
-  lifecycle {
-    create_before_destroy = true
-  }
 }
 
 ## Creates auto scaling cluster
@@ -216,7 +212,7 @@ module "cluster" {
   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        = "${template_file.user_data.rendered}"
+  user_data        = "${data.template_file.user_data.rendered}"
   key_name         = "${var.key_name}"
   ebs_optimized    = false
 

circle.yml

@@ -1,6 +1,6 @@
 machine:
   environment:
-    TF_VERSION: 0.6.16
+    TF_VERSION: 0.7.4
     TF_URL: https://releases.hashicorp.com/terraform/${TF_VERSION}/terraform_${TF_VERSION}_linux_amd64.zip
 dependencies:
   pre:

generate-certs/main.tf

@@ -115,7 +115,7 @@ resource "aws_security_group_rule" "allow_ssh_in" {
 }
 
 ## Creates user instance data
-resource "template_file" "user_data" {
+data "template_file" "user_data" {
   template = "${file("${path.module}/templates/user_data.tpl")}"
 
   vars {
@@ -155,5 +155,5 @@ resource "aws_instance" "generate_certs" {
     managed_by  = "terraform"
   }
 
-  user_data = "${template_file.user_data.rendered}"
+  user_data = "${data.template_file.user_data.rendered}"
 }