Tweaks DO example Terraform.

terraform/digitalocean/README.md

@@ -1,8 +1,8 @@
-
 # Requirements
-Terraform installed  
-Digital Ocean account with API key  
-SSH key uploaded to Digital Ocean  
+
+* Terraform installed
+* Digital Ocean account with API key
+* SSH key uploaded to Digital Ocean
 
 ### Variables
 Populate terraform.tfvars as follows (or execute with arguments as shown in Usage)
@@ -11,7 +11,7 @@ Populate terraform.tfvars as follows (or execute with arguments as shown in Usag
     do_token = "ASDFQWERTYDERP"
     num_instances = "3"
     ssh_key_ID = "my_ssh_keyID_in_digital_ocean"
-
+    region = "desired DO region"
 
 # Usage
 
@@ -19,10 +19,12 @@ Populate terraform.tfvars as follows (or execute with arguments as shown in Usag
       -var 'key_path=~/.ssh/id_rsa'     \
       -var 'do_token=ASDFQWERTYDERP'    \
       -var 'num_instances=3'            \
-      - var 'ssh_key_ID=86:75:30:99:88:88:AA:FF:DD'
+      -var 'ssh_key_ID=86:75:30:99:88:88:AA:FF:DD' \
+      -var 'region=tor1'
 
     terraform apply                     \
       -var 'key_path=~/.ssh/id_rsa'     \
       -var 'do_token=ASDFQWERTYDERP'    \
       -var 'num_instances=3'            \
-      - var 'ssh_key_ID=86:75:30:99:88:88:AA:FF:DD'
+      -var 'ssh_key_ID=86:75:30:99:88:88:AA:FF:DD' \
+      -var 'region=tor1'

terraform/digitalocean/consul.tf

@@ -5,7 +5,7 @@ provider "digitalocean" {
 resource "digitalocean_droplet" "consul" {
   ssh_keys           = ["${var.ssh_key_ID}"]
   image              = "${var.ubuntu}"
-	region = "${var.do_tor1}"
+  region             = "${var.region}"
   size               = "2gb"
   private_networking = true
   name               = "consul${count.index + 1}"
@@ -37,5 +37,4 @@ resource "digitalocean_droplet" "consul" {
       "${path.module}/../shared/scripts/ip_tables.sh",
     ]
   }
-
 }

terraform/digitalocean/terraform.tfvars.example

@@ -2,3 +2,4 @@ key_path = "~/.ssh/id_rsa"
 ssh_key_ID = "my_ssh_key_ID_or_fingerprint_NOT_SSH_KEY_NAME"
 do_token = "ASDFQWERTYDERP"
 num_instances = "3"
+region = "tor1"

terraform/digitalocean/variables.tf

@@ -1,67 +1,14 @@
 variable "do_token" {}
+
 variable "key_path" {}
+
 variable "ssh_key_ID" {}
+
+variable "region" {}
+
 variable "num_instances" {}
 
-## below sourced from 
-## https://github.com/hashicorp/terraform/blob/master/examples/digitalocean/variable.tf
-
-# ####
-# Current Availiable Datacenter Regions
-# As of 05-07-2016
-#
-
-variable "do_ams2" {
-    description = "Digital Ocean Amsterdam Data Center 2"
-    default = "ams2"
-}
-
-variable "do_ams3" {
-    description = "Digital Ocean Amsterdam Data Center 3"
-    default = "ams3"
-}
-
-variable "do_fra1" {
-    description = "Digital Ocean Frankfurt Data Center 1"
-    default = "fra1"
-}
-
-variable "do_lon1" {
-    description = "Digital Ocean London Data Center 1"
-    default = "lon1"
-}
-
-variable "do_nyc1" {
-    description = "Digital Ocean New York Data Center 1"
-    default = "nyc1"
-}
-
-variable "do_nyc2" {
-    description = "Digital Ocean New York Data Center 2"
-    default = "nyc2"
-}
-
-variable "do_nyc3" {
-    description = "Digital Ocean New York Data Center 3"
-    default = "nyc3"
-}
-
-variable "do_sfo1" {
-    description = "Digital Ocean San Francisco Data Center 1"
-    default = "sfo1"
-}
-
-variable "do_sgp1" {
-    description = "Digital Ocean Singapore Data Center 1"
-    default = "sgp1"
-}
-
-variable "do_tor1" {
-    description = "Digital Ocean Toronto Datacenter 1"
-    default = "tor1"
-}
-
-# Default Os
+# Default OS
 
 variable "ubuntu" {
   description = "Default LTS"