From 71cac63f2897ea6221e33ca6a657fd71b6c6f3cd Mon Sep 17 00:00:00 2001
From: Omar Khawaja <Omar-Khawaja@users.noreply.github.com>
Date: Fri, 25 Oct 2019 14:15:30 -0400
Subject: [PATCH] separate vars and outputs into their own files and update
 default link in nomad binary variable to 0.10.0 release (#6550)

---
 terraform/aws/env/us-east/main.tf          | 96 ----------------------
 terraform/aws/env/us-east/outputs.tf       | 33 ++++++++
 terraform/aws/env/us-east/terraform.tfvars |  2 +-
 terraform/aws/env/us-east/variables.tf     | 60 ++++++++++++++
 4 files changed, 94 insertions(+), 97 deletions(-)
 create mode 100644 terraform/aws/env/us-east/outputs.tf
 create mode 100644 terraform/aws/env/us-east/variables.tf

diff --git a/terraform/aws/env/us-east/main.tf b/terraform/aws/env/us-east/main.tf
index 448995039..c0ff3cfc3 100644
--- a/terraform/aws/env/us-east/main.tf
+++ b/terraform/aws/env/us-east/main.tf
@@ -1,64 +1,3 @@
-variable "name" {
-  description = "Used to name various infrastructure components"
-}
-
-variable "whitelist_ip" {
-  description = "IP to whitelist for the security groups (set 0.0.0.0/0 for world)"
-}
-
-variable "region" {
-  description = "The AWS region to deploy to."
-  default     = "us-east-1"
-}
-
-variable "ami" {
-}
-
-variable "server_instance_type" {
-  description = "The AWS instance type to use for servers."
-  default     = "t2.medium"
-}
-
-variable "client_instance_type" {
-  description = "The AWS instance type to use for clients."
-  default     = "t2.medium"
-}
-
-variable "root_block_device_size" {
-  description = "The volume size of the root block device."
-  default     = 16
-}
-
-variable "key_name" {
-  description = "Name of the SSH key used to provision EC2 instances."
-}
-
-variable "server_count" {
-  description = "The number of servers to provision."
-  default     = "3"
-}
-
-variable "client_count" {
-  description = "The number of clients to provision."
-  default     = "4"
-}
-
-variable "retry_join" {
-  description = "Used by Consul to automatically form a cluster."
-  type        = map(string)
-
-  default = {
-    provider  = "aws"
-    tag_key   = "ConsulAutoJoin"
-    tag_value = "auto-join"
-  }
-}
-
-variable "nomad_binary" {
-  description = "Used to replace the machine image installed Nomad binary."
-  default     = "none"
-}
-
 provider "aws" {
   region = var.region
 }
@@ -79,38 +18,3 @@ module "hashistack" {
   root_block_device_size = var.root_block_device_size
   whitelist_ip           = var.whitelist_ip
 }
-
-output "IP_Addresses" {
-  value = <<CONFIGURATION
-
-Client public IPs: ${join(", ", module.hashistack.client_public_ips)}
-
-Server public IPs: ${join(", ", module.hashistack.server_public_ips)}
-
-To connect, add your private key and SSH into any client or server with
-`ssh ubuntu@PUBLIC_IP`. You can test the integrity of the cluster by running:
-
-  $ consul members
-  $ nomad server members
-  $ nomad node status
-
-If you see an error message like the following when running any of the above
-commands, it usually indicates that the configuration script has not finished
-executing:
-
-"Error querying servers: Get http://127.0.0.1:4646/v1/agent/members: dial tcp
-127.0.0.1:4646: getsockopt: connection refused"
-
-Simply wait a few seconds and rerun the command if this occurs.
-
-The Nomad UI can be accessed at http://${module.hashistack.server_lb_ip}:4646/ui.
-The Consul UI can be accessed at http://${module.hashistack.server_lb_ip}:8500/ui.
-
-Set the following for access from the Nomad CLI:
-
-  export NOMAD_ADDR=http://${module.hashistack.server_lb_ip}:4646
-
-CONFIGURATION
-
-}
-
diff --git a/terraform/aws/env/us-east/outputs.tf b/terraform/aws/env/us-east/outputs.tf
new file mode 100644
index 000000000..2fb95065a
--- /dev/null
+++ b/terraform/aws/env/us-east/outputs.tf
@@ -0,0 +1,33 @@
+output "IP_Addresses" {
+  value = <<CONFIGURATION
+
+Client public IPs: ${join(", ", module.hashistack.client_public_ips)}
+
+Server public IPs: ${join(", ", module.hashistack.server_public_ips)}
+
+To connect, add your private key and SSH into any client or server with
+`ssh ubuntu@PUBLIC_IP`. You can test the integrity of the cluster by running:
+
+  $ consul members
+  $ nomad server members
+  $ nomad node status
+
+If you see an error message like the following when running any of the above
+commands, it usually indicates that the configuration script has not finished
+executing:
+
+"Error querying servers: Get http://127.0.0.1:4646/v1/agent/members: dial tcp
+127.0.0.1:4646: getsockopt: connection refused"
+
+Simply wait a few seconds and rerun the command if this occurs.
+
+The Nomad UI can be accessed at http://${module.hashistack.server_lb_ip}:4646/ui.
+The Consul UI can be accessed at http://${module.hashistack.server_lb_ip}:8500/ui.
+
+Set the following for access from the Nomad CLI:
+
+  export NOMAD_ADDR=http://${module.hashistack.server_lb_ip}:4646
+
+CONFIGURATION
+
+}
diff --git a/terraform/aws/env/us-east/terraform.tfvars b/terraform/aws/env/us-east/terraform.tfvars
index 1db0dc516..b20fec000 100644
--- a/terraform/aws/env/us-east/terraform.tfvars
+++ b/terraform/aws/env/us-east/terraform.tfvars
@@ -13,7 +13,7 @@ name = "nomad"
 # `nomad_binary` (optional, null) - URL of a zip file containing a nomad
 # executable with which to replace the Nomad binaries in the AMI.
 #  - Typically this is left commented unless necessary. 
-#nomad_binary = "https://releases.hashicorp.com/nomad/0.9.0/nomad_0.9.0_linux_amd64.zip"
+#nomad_binary = "https://releases.hashicorp.com/nomad/0.10.0/nomad_0.10.0_linux_amd64.zip"
 
 # `region` ("us-east-1") - sets the AWS region to build your cluster in.
 #region = "us-east-1"
diff --git a/terraform/aws/env/us-east/variables.tf b/terraform/aws/env/us-east/variables.tf
new file mode 100644
index 000000000..c2dbcc1a3
--- /dev/null
+++ b/terraform/aws/env/us-east/variables.tf
@@ -0,0 +1,60 @@
+variable "name" {
+  description = "Used to name various infrastructure components"
+}
+
+variable "whitelist_ip" {
+  description = "IP to whitelist for the security groups (set 0.0.0.0/0 for world)"
+}
+
+variable "region" {
+  description = "The AWS region to deploy to."
+  default     = "us-east-1"
+}
+
+variable "ami" {
+}
+
+variable "server_instance_type" {
+  description = "The AWS instance type to use for servers."
+  default     = "t2.medium"
+}
+
+variable "client_instance_type" {
+  description = "The AWS instance type to use for clients."
+  default     = "t2.medium"
+}
+
+variable "root_block_device_size" {
+  description = "The volume size of the root block device."
+  default     = 16
+}
+
+variable "key_name" {
+  description = "Name of the SSH key used to provision EC2 instances."
+}
+
+variable "server_count" {
+  description = "The number of servers to provision."
+  default     = "3"
+}
+
+variable "client_count" {
+  description = "The number of clients to provision."
+  default     = "4"
+}
+
+variable "retry_join" {
+  description = "Used by Consul to automatically form a cluster."
+  type        = map(string)
+
+  default = {
+    provider  = "aws"
+    tag_key   = "ConsulAutoJoin"
+    tag_value = "auto-join"
+  }
+}
+
+variable "nomad_binary" {
+  description = "Used to replace the machine image installed Nomad binary."
+  default     = "none"
+}