From d8cdef154a3fe87dfd749a89f3c09334fc5094f3 Mon Sep 17 00:00:00 2001
From: "Author: James Rasell" <jamesrasell@gmail.com>
Date: Thu, 22 Dec 2016 13:26:24 +0000
Subject: [PATCH] Update the AWS terraform variables file to include us-east-2
 AMIs.

AMIs have been added for Ubuntu, CentOS[6-7] and RH[6-7].
Terraform fmt has also been run on the file.
---
 terraform/aws/variables.tf | 83 +++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 38 deletions(-)

diff --git a/terraform/aws/variables.tf b/terraform/aws/variables.tf
index 8e95540fc2..64fb20ed25 100644
--- a/terraform/aws/variables.tf
+++ b/terraform/aws/variables.tf
@@ -1,38 +1,44 @@
 variable "platform" {
-    default = "ubuntu"
-    description = "The OS Platform"
+  default     = "ubuntu"
+  description = "The OS Platform"
 }
 
 variable "user" {
-    default = {
-        ubuntu  = "ubuntu"
-        rhel6   = "ec2-user"
-        centos6 = "centos"
-        centos7 = "centos"
-        rhel7   = "ec2-user"
-    }
+  default = {
+    ubuntu  = "ubuntu"
+    rhel6   = "ec2-user"
+    centos6 = "centos"
+    centos7 = "centos"
+    rhel7   = "ec2-user"
+  }
 }
 
 variable "ami" {
-    description           = "AWS AMI Id, if you change, make sure it is compatible with instance type, not all AMIs allow all instance types "
-    default = {
-        us-east-1-ubuntu  = "ami-fce3c696"
-        us-west-1-ubuntu  = "ami-a9a8e4c9"
-        us-west-2-ubuntu  = "ami-9abea4fb"
-        eu-west-1-ubuntu = "ami-47a23a30"
-        eu-central-1-ubuntu = "ami-accff2b1"
-        ap-northeast-1-ubuntu = "ami-90815290"
-        ap-southeast-1-ubuntu = "ami-0accf458"
-        ap-southeast-2-ubuntu = "ami-1dc8b127"
-        us-east-1-rhel6   = "ami-0d28fe66"
-        us-west-2-rhel6   = "ami-3d3c0a0d"
-        us-east-1-centos6 = "ami-57cd8732"
-        us-west-2-centos6 = "ami-1255b321"
-        us-east-1-rhel7   = "ami-2051294a"
-        us-west-2-rhel7   = "ami-775e4f16"
-        us-east-1-centos7 = "ami-6d1c2007"
-        us-west-1-centos7 = "ami-af4333cf"
-    }
+  description = "AWS AMI Id, if you change, make sure it is compatible with instance type, not all AMIs allow all instance types "
+
+  default = {
+    us-east-1-ubuntu      = "ami-fce3c696"
+    us-east-2-ubuntu      = "ami-b7075dd2"
+    us-west-1-ubuntu      = "ami-a9a8e4c9"
+    us-west-2-ubuntu      = "ami-9abea4fb"
+    eu-west-1-ubuntu      = "ami-47a23a30"
+    eu-central-1-ubuntu   = "ami-accff2b1"
+    ap-northeast-1-ubuntu = "ami-90815290"
+    ap-southeast-1-ubuntu = "ami-0accf458"
+    ap-southeast-2-ubuntu = "ami-1dc8b127"
+    us-east-1-rhel6       = "ami-0d28fe66"
+    us-east-2-rhel6       = "ami-aff2a9ca"
+    us-west-2-rhel6       = "ami-3d3c0a0d"
+    us-east-1-centos6     = "ami-57cd8732"
+    us-east-2-centos6     = "ami-c299c2a7"
+    us-west-2-centos6     = "ami-1255b321"
+    us-east-1-rhel7       = "ami-2051294a"
+    us-east-2-rhel7       = "ami-0a33696f"
+    us-west-2-rhel7       = "ami-775e4f16"
+    us-east-1-centos7     = "ami-6d1c2007"
+    us-east-2-centos7     = "ami-6a2d760f"
+    us-west-1-centos7     = "ami-af4333cf"
+  }
 }
 
 variable "service_conf" {
@@ -44,6 +50,7 @@ variable "service_conf" {
     rhel7   = "rhel_consul.service"
   }
 }
+
 variable "service_conf_dest" {
   default = {
     ubuntu  = "upstart.conf"
@@ -55,29 +62,29 @@ variable "service_conf_dest" {
 }
 
 variable "key_name" {
-    description = "SSH key name in your AWS account for AWS instances."
+  description = "SSH key name in your AWS account for AWS instances."
 }
 
 variable "key_path" {
-    description = "Path to the private key specified by key_name."
+  description = "Path to the private key specified by key_name."
 }
 
 variable "region" {
-    default = "us-east-1"
-    description = "The region of AWS, for AMI lookups."
+  default     = "us-east-1"
+  description = "The region of AWS, for AMI lookups."
 }
 
 variable "servers" {
-    default = "3"
-    description = "The number of Consul servers to launch."
+  default     = "3"
+  description = "The number of Consul servers to launch."
 }
 
 variable "instance_type" {
-    default = "t2.micro"
-    description = "AWS Instance type, if you change, make sure it is compatible with AMI, not all AMIs allow all instance types "
+  default     = "t2.micro"
+  description = "AWS Instance type, if you change, make sure it is compatible with AMI, not all AMIs allow all instance types "
 }
 
 variable "tagName" {
-    default = "consul"
-    description = "Name tag for the servers"
+  default     = "consul"
+  description = "Name tag for the servers"
 }