From e3e38a815c7a683df6b7bf1b78e2380f27ec7ee3 Mon Sep 17 00:00:00 2001
From: Sathiya Shunmugasundaram <sathiya.shunmugasundaram@capitalone.com>
Date: Tue, 2 Jun 2015 15:54:08 -0400
Subject: [PATCH] AMI changes to reflect latest HVM and instance type changes
 to t2.micro

---
 terraform/aws/consul.tf    |  2 +-
 terraform/aws/variables.tf | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/terraform/aws/consul.tf b/terraform/aws/consul.tf
index 0db1e1dba..d1c57d9bb 100644
--- a/terraform/aws/consul.tf
+++ b/terraform/aws/consul.tf
@@ -1,6 +1,6 @@
 resource "aws_instance" "server" {
     ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}"
-    instance_type = "${lookup(var.instance_type, var.platform)}"
+    instance_type = "${var.instance_type}"
     key_name = "${var.key_name}"
     count = "${var.servers}"
     security_groups = ["${aws_security_group.consul.name}"]
diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
index f75fde2ea..94c0e310f 100644
--- a/terraform/aws/variables.tf
+++ b/terraform/aws/variables.tf
@@ -11,9 +11,10 @@ variable "user" {
 }
 
 variable "ami" {
+    description = "AWS AMI Id, if you change, make sure it is compatible with insatnce type, not all AMIs allow all insatnce types "
     default = {
-        us-east-1-ubuntu = "ami-3acc7a52"
-        us-west-2-ubuntu = "ami-37501207"
+        us-east-1-ubuntu = "ami-83c525e8"
+        us-west-2-ubuntu = "ami-57e8d767"
         us-east-1-rhel6 = "ami-b0fed2d8"
         us-west-2-rhel6 = "ami-2faa861f"
     }
@@ -38,10 +39,8 @@ variable "servers" {
 }
 
 variable "instance_type" {
-    default = {
-        ubuntu = "m1.small"
-        rhel6 = "m3.medium"
-    }
+    default = "t2.micro"
+    description = "AWS Instance type, if you change, make sure it is compatible with AMI, not all AMIs allow all insatnce types "
 }
 
 variable "tagName" {