variable changes for instance types

terraform/aws/consul.tf

@@ -1,7 +1,6 @@
 resource "aws_instance" "server" {
     ami = "${lookup(var.ami, concat(var.region, "-", var.platform))}"
-    #ami = "${lookup(var.ami, var.region, var.platform)}"
-    instance_type = "${var.instance_type}"
+    instance_type = "${lookup(var.instance_type, var.platform)}"
     key_name = "${var.key_name}"
     count = "${var.servers}"
     security_groups = ["${aws_security_group.consul.name}"]

terraform/aws/variables.tf

@@ -3,11 +3,6 @@ variable "platform" {
     description = "The region of AWS, for AMI lookups."
 }
 
-variable "user" {
-    default = "ubuntu"
-    description = "The region of AWS, for AMI lookups."
-}
-
 variable "user" {
     default = {
         ubuntu = "ubuntu"
@@ -43,8 +38,10 @@ variable "servers" {
 }
 
 variable "instance_type" {
-    default = "m3.medium"
-    description = "The instance type to launch."
+    default = {
+        ubuntu = "m1.small"
+        rhel6 = "m3.medium"
+    }
 }
 
 variable "tagName" {