Upgrades Terraform and Provider versions

ahoskingit/terraform/.terraform/plugins/linux_amd64/lock.json

@@ -1,4 +1,4 @@
 {
-  "aws": "a037be6b5e706483d4e1d46b9fde247b13c1aa729a8be28956f4eced79a7e40f",
+  "aws": "d8a5e7969884c03cecbfd64fb3add8c542c918c5a8c259d1b31fadbbee284fb7",
-  "cloudflare": "bbc331f70d633c54820613d6cc60c13d3942c1787f3c334c297d84248b60a3a1"
+  "cloudflare": "28998f10e7c4c2aeef7e5b6532a60aa91b3503be19aa9df16907c6ea4adc6589"
 }

ahoskingit/terraform/dns_ahosking.tf

@@ -6,33 +6,33 @@ resource "aws_route53_zone" "ahosking" {
 }
 
 resource "aws_route53_record" "ahosking" {
-    zone_id = "${aws_route53_zone.ahosking.zone_id}"
+    zone_id = aws_route53_zone.ahosking.zone_id
     name = "ahosking.com"
     type = "A"
     ttl = "5"
-    records = ["${var.site5_ip}"]
+    records = [var.site5_ip]
 }
 
 resource "aws_route53_record" "ahosking_wildcard" {
-    zone_id = "${aws_route53_zone.ahosking.zone_id}"
+    zone_id = aws_route53_zone.ahosking.zone_id
     name = "*.ahosking.com"
     type = "A"
     ttl = "5"
-    records = ["${var.site5_ip}"]
+    records = [var.site5_ip]
 }
 
 resource "aws_route53_record" "ahosking_www" {
-    zone_id = "${aws_route53_zone.ahosking.zone_id}"
+    zone_id = aws_route53_zone.ahosking.zone_id
     name = "www.ahosking.com"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.ahosking.name}"]
+    records = [aws_route53_record.ahosking.name]
 }
 
 # email MX records for DNS
 resource "aws_route53_record" "ahosking_mx" {
-    zone_id = "${aws_route53_zone.ahosking.zone_id}"
+    zone_id = aws_route53_zone.ahosking.zone_id
-    name = "${aws_route53_zone.ahosking.name}"
+    name = aws_route53_zone.ahosking.name
     type = "MX"
     ttl = "60"
     records = ["1 ASPMX.L.GOOGLE.COM",
@@ -41,10 +41,10 @@ resource "aws_route53_record" "ahosking_mx" {
                "10 ALT3.ASPMX.L.GOOGLE.COM",
                "10 ALT4.ASPMX.L.GOOGLE.COM"]
 }
-#resource "aws_route53_record" "ahosking_txt" {
+resource "aws_route53_record" "ahosking_txt" {
-#    zone_id = "${aws_route53_zone.ahosking.zone_id}"
+   zone_id = aws_route53_zone.ahosking.zone_id
-#    name = "${aws_route53_zone.ahosking.name}"
+   name = aws_route53_zone.ahosking.name
-#    type = "TXT"
+   type = "TXT"
-#    ttl = "60"
+   ttl = "60"
-#    records = ["google-site-verification=8-QKnBQElI58gnygDWcCzvDGRh31c_bFmNMaSd0fCwE"]
+   records = ["google-site-verification=8-QKnBQElI58gnygDWcCzvDGRh31c_bFmNMaSd0fCwE"]
-#}
+}

ahoskingit/terraform/dns_ahoskingit.tf

@@ -19,7 +19,7 @@ resource "cloudflare_record" "ahoskingit_www" {
     zone_id = cloudflare_zone.ahoskingit_com.id
     name = "www"
     type = "CNAME"
-    value = "cloudflare_record.ahoskingit.name"
+    value = cloudflare_record.ahoskingit.name
     proxied = "true"
 }
 
@@ -27,7 +27,7 @@ resource "cloudflare_record" "ahoskingit_influx" {
     zone_id = cloudflare_zone.ahoskingit_com.id
     name = "influx"
     type = "CNAME"
-    value = "home.ahoskingit.com"
+    value = join(".", [cloudflare_record.home_ahoskingit.name, cloudflare_zone.ahoskingit_com.zone])
     proxied = "true"
 }
 
@@ -43,7 +43,7 @@ resource "cloudflare_record" "ahoskingit_plex" {
     zone_id = cloudflare_zone.ahoskingit_com.id
     name = "plex.ahoskingit.com"
     type = "CNAME"
-    value = "home.ahoskingit.com"
+    value = join(".", [cloudflare_record.home_ahoskingit.name, cloudflare_zone.ahoskingit_com.zone])
     proxied = "true"
 }
 
@@ -76,7 +76,7 @@ resource "cloudflare_record" "lab_ahoskingit" {
     name = "lab"
     type = "CNAME"
     proxied = true
-    value = cloudflare_record.kfa_ahoskingit.value
+    value = join(".", [cloudflare_record.kfa_ahoskingit.name, cloudflare_zone.ahoskingit_com.zone])
 }
 
 resource "cloudflare_record" "logs_ahoskingit" {
@@ -178,35 +178,35 @@ resource "cloudflare_record" "monitors_ahoskingit" {
 # email MX records for DNS
 resource "cloudflare_record" "ahoskingit_com_mx" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = "cloudflare_zone.ahoskingit_com.zone"
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "MX"
     value = "aspmx.l.google.com"
     priority = 1
 }
 resource "cloudflare_record" "ahoskingit_com_mx1" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = cloudflare_zone.ahoskingit_com.id
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "MX"
     value = "alt1.aspmx.l.google.com"
     priority = 5
 }
 resource "cloudflare_record" "ahoskingit_com_mx2" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = cloudflare_zone.ahoskingit_com.id
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "MX"
     value = "alt2.aspmx.l.google.com"
     priority = 5
 }
 resource "cloudflare_record" "ahoskingit_com_mx3" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = cloudflare_zone.ahoskingit_com.id
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "MX"
     value = "alt3.aspmx.l.google.com"
     priority = 10
 }
 resource "cloudflare_record" "ahoskingit_com_mx4" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = cloudflare_zone.ahoskingit_com.id
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "MX"
     value = "alt4.aspmx.l.google.com"
     priority = 10
@@ -214,7 +214,7 @@ resource "cloudflare_record" "ahoskingit_com_mx4" {
 
 resource "cloudflare_record" "ahoskingit_com_txt" {
     zone_id = cloudflare_zone.ahoskingit_com.id
-    name = cloudflare_zone.ahoskingit_com.id
+    name = cloudflare_zone.ahoskingit_com.zone
     type = "TXT"
     ttl = 120
     value = "google-site-verification=8-QKnBQElI58gnygDWcCzvDGRh31c_bFmNMaSd0fCwE"

ahoskingit/terraform/dns_ahoskingit_ca.tf

@@ -6,106 +6,106 @@ resource "aws_route53_zone" "ahoskingit_ca" {
 }
 
 resource "aws_route53_record" "ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "ahoskingit.ca"
     type = "A"
     ttl = "5"
-    records = ["${var.site5_ip}"]
+    records = [var.site5_ip]
 }
 
 resource "aws_route53_record" "ahoskingit_ca_www" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "www.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.ahoskingit_ca.name}"]
+    records = [aws_route53_record.ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "home_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "home.ahoskingit.ca"
     type = "A"
     ttl = "5"
-    records = ["${var.home_ip}"]
+    records = [var.home_ip]
 }
 
 resource "aws_route53_record" "inventory_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "inventory.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "plex_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "plex.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "ns1_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "ns1.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "docs_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "docs.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "cloud_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "cloud.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "support_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "support.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "git_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "git.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 resource "aws_route53_record" "gitlab_ahoskingit_ca" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
     name = "gitlab.ahoskingit.ca"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.home_ahoskingit_ca.name}"]
+    records = [aws_route53_record.home_ahoskingit_ca.name]
 }
 
 ##Route53 DNS entry
 #resource "aws_route53_record" "www_ahoskingit_ca" {
-#    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+#    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
 #    name = "www.ahoskingit.ca"
 #    type = "A"
 #    ttl = "5"
-#    records = ["${var.home_ip}"]
+#    records = [var.home_ip]
 #}
 
 # email MX records for DNS
 resource "aws_route53_record" "ahoskingit_ca_mx" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
-    name = "${aws_route53_zone.ahoskingit_ca.name}"
+    name = aws_route53_zone.ahoskingit_ca.name
     type = "MX"
     ttl = "60"
     records = ["1 ASPMX.L.GOOGLE.COM",
@@ -115,8 +115,8 @@ resource "aws_route53_record" "ahoskingit_ca_mx" {
                "10 ALT4.ASPMX.L.GOOGLE.COM"]
 }
 resource "aws_route53_record" "ahoskingit_ca_txt" {
-    zone_id = "${aws_route53_zone.ahoskingit_ca.zone_id}"
+    zone_id = aws_route53_zone.ahoskingit_ca.zone_id
-    name = "${aws_route53_zone.ahoskingit_ca.name}"
+    name = aws_route53_zone.ahoskingit_ca.name
     type = "TXT"
     ttl = "60"
     records = ["google-site-verification=BgSCW0dvRYo4wR3l4ubjfq--VXsv554GIxgCDTyMK78"]

ahoskingit/terraform/dns_automatedbytes.tf

@@ -10,39 +10,39 @@ resource "aws_route53_zone" "automatedbytes" {
 
 #Route53 DNS entry
 resource "aws_route53_record" "automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
     name = "automatedbytes.com"
     type = "A"
     ttl = "5"
-    records = ["${var.vultr_ip}"]
+    records = [var.vultr_ip]
 }
 
 resource "aws_route53_record" "www_automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
     name = "www.automatedbytes.com"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.automatedbytes.name}"]
+    records = [aws_route53_record.automatedbytes.name]
 }
 
 resource "aws_route53_record" "wildcard_automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
     name = "*.automatedbytes.com"
     type = "CNAME"
     ttl = "5"
-    records = ["${aws_route53_record.automatedbytes.name}"]
+    records = [aws_route53_record.automatedbytes.name]
 }
 
 resource "aws_route53_record" "support_automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
     name = "support.automatedbytes.com"
     type = "A"
     ttl = "5"
-    records = ["${var.home_ip}"]
+    records = [var.home_ip]
 }
 
 resource "aws_route53_record" "kfa_support_automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
     name = "kfa.support.automatedbytes.com"
     type = "CNAME"
     ttl = "5"
@@ -51,8 +51,8 @@ resource "aws_route53_record" "kfa_support_automatedbytes" {
 
 ## Email MX records
 resource "aws_route53_record" "mx_automatedbytes" {
-    zone_id = "${aws_route53_zone.automatedbytes.zone_id}"
+    zone_id = aws_route53_zone.automatedbytes.zone_id
-    name = "${aws_route53_zone.automatedbytes.name}"
+    name = aws_route53_zone.automatedbytes.name
     type = "MX"
     ttl = "60"
     records = ["1 ASPMX.L.GOOGLE.COM",
@@ -63,10 +63,9 @@ resource "aws_route53_record" "mx_automatedbytes" {
 }
 
 resource "cloudflare_record" "support_automatedbytes" {
-    domain = "${cloudflare_zone.automatedbytes_com.zone}"
+    zone_id = cloudflare_zone.automatedbytes_com.id
     name = "support"
     type = "A"
     proxied = true
-    value = "${var.home_ip}"
+    value = var.home_ip
-}
+}
-

ahoskingit/terraform/dns_studi-odesigns.tf

@@ -6,24 +6,24 @@ resource "cloudflare_zone" "studi-o_ca" {
     zone = "studi-odesigns.ca"
 }
 resource "cloudflare_record" "studi-o_com_www" {
-  domain = "${var.studi-odesigns_com}"
+  zone_id = cloudflare_zone.studi-o_com.id
   name   = "www"
-  value  = "${var.studi-odesigns_com}"
+  value  = var.studi-odesigns_com
   type   = "CNAME"
   ttl = 1
   proxied = true
 }
 resource "cloudflare_record" "studi-o_com" {
-  domain = "${var.studi-odesigns_com}"
+  zone_id = cloudflare_zone.studi-o_com.id
   name   = "studi-odesigns.com"
-  value  = "${var.vultr_ip}"
+  value  = var.vultr_ip
   type   = "A"
   ttl = 1
   proxied = true
 }
 
 resource "cloudflare_record" "studi-o_com_txt" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "TXT"
     value = "google-site-verification=AJw8umnraEhTYuHsrVc-5NvA7E2p08OF90HgPv8jWX4"
@@ -31,7 +31,7 @@ resource "cloudflare_record" "studi-o_com_txt" {
 }
 
 resource "cloudflare_record" "studi-o_com_mx" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "MX"
     value = "aspmx.l.google.com"
@@ -39,7 +39,7 @@ resource "cloudflare_record" "studi-o_com_mx" {
 }
 
 resource "cloudflare_record" "studi-o_com_mx1" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "MX"
     value = "alt1.aspmx.l.google.com"
@@ -47,21 +47,21 @@ resource "cloudflare_record" "studi-o_com_mx1" {
 }
 
 resource "cloudflare_record" "studi-o_com_mx2" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "MX"
     value = "alt2.aspmx.l.google.com"
     priority = "5"
 }
 resource "cloudflare_record" "studi-o_com_mx3" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "MX"
     value = "aspmx2.googlemail.com"
     priority = "10"
 }
 resource "cloudflare_record" "studi-o_com_mx4" {
-    domain = "${var.studi-odesigns_com}"
+    zone_id = cloudflare_zone.studi-o_com.id
     name = "@"
     type = "MX"
     value = "aspmx3.googlemail.com"
@@ -69,7 +69,7 @@ resource "cloudflare_record" "studi-o_com_mx4" {
 }
 
 resource "cloudflare_record" "studi-o_ca_www" {
-  domain = "${var.studi-odesigns_ca}"
+  zone_id = cloudflare_zone.studi-o_ca.id
   name   = "www"
   value  = "automatedbytes.com"
   type   = "CNAME"
@@ -77,7 +77,7 @@ resource "cloudflare_record" "studi-o_ca_www" {
 }
 
 resource "cloudflare_record" "studi-o_ca_txt" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "TXT"
     value = "google-site-verification=1VQq6Qc0OSpPKs_cd9nKIAGiTw9I7uQbmwnlGd44yo8"
@@ -85,7 +85,7 @@ resource "cloudflare_record" "studi-o_ca_txt" {
 }
 
 resource "cloudflare_record" "studi-o_ca_mx" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "MX"
     value = "aspmx.l.google.com"
@@ -93,7 +93,7 @@ resource "cloudflare_record" "studi-o_ca_mx" {
 }
 
 resource "cloudflare_record" "studi-o_ca_mx1" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "MX"
     value = "alt1.aspmx.l.google.com"
@@ -101,21 +101,21 @@ resource "cloudflare_record" "studi-o_ca_mx1" {
 }
 
 resource "cloudflare_record" "studi-o_ca_mx2" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "MX"
     value = "alt2.aspmx.l.google.com"
     priority = "5"
 }
 resource "cloudflare_record" "studi-o_ca_mx3" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "MX"
     value = "aspmx2.googlemail.com"
     priority = "10"
 }
 resource "cloudflare_record" "studi-o_ca_mx4" {
-    domain = "${var.studi-odesigns_ca}"
+    zone_id = cloudflare_zone.studi-o_ca.id
     name = "@"
     type = "MX"
     value = "aspmx3.googlemail.com"

ahoskingit/terraform/prodviders.tf

@@ -1,16 +1,22 @@
-provider "aws" {
+provider "cloudflare" {
-  access_key = "${var.aws_access_key}"
+  version = "~> 2.0"
-  secret_key = "${var.aws_secret_key}"
+
-  region = "${var.aws_region}"
+  email = var.CLOUDFLARE_EMAIL
+  api_key = var.CLOUDFLARE_API_KEY
+  account_id = var.CLOUDFLARE_ACCOUNT_ID
 }
 
-#provider "google" {
+provider "aws" {
-#  credentials   = "" 
+  version = "~> 2.0"
-##  project       = "${var.gcp_project}"
-#  region        = "${var.gcp_region}"
-#}
 
-provider "cloudflare" {
+  region = "us-east-1"
-  email = "${var.cloudflare_email}"
+
-  token = "${var.cloudflare_token}"
+  access_key = var.aws_access_key
+  secret_key = var.aws_secret_key
+  
+  
+  skip_credentials_validation = true
+  skip_region_validation = true
+  skip_requesting_account_id = true
+  skip_metadata_api_check = true
 }

ahoskingit/terraform/terraform.vault

@@ -1,130 +1,21 @@
 $ANSIBLE_VAULT;1.1;AES256
-35373664656235373961643432613033653930313464323330366263643738393164626439323635
+30343064656666643062356665633334616630643231363563656661613932656436633839306563
-3464393438353732363766323535646565323364616132300a346137613361336162373635633164
+3535656138303566653736353261303434633934316635300a363337373137366263663364313364
-38616439323932353962613061636434643339383461643632393030373931656433346135353963
+38636562373264636133643934646532623165346664383062343838333537343135626537303037
-3739643165333765370a343163666565306666306163633163613832396164316464393435343338
+3864366266643737310a653635653935363637373363303762313632393432326265666264326466
-37633462383061613861633666306665656337313738623430353461646330343039353865386232
+33303966316263373362633237363937663131323336666135663437393532363332653463313831
-62613164656234363536663738366263313664643232363135316432323163666665313034333665
+36306263346164343262303565643832613030363262646632623535613738346634343261336530
-61333137393830663536393335646335376538316562623332616231666435643430626234353037
+31303763346631393834346664336336326331356433666133653062303633343939633964363834
-65323437356262386533306561633464663937366337616337663133353433386361343264346235
+65636633663664316632663138663335313263376262303239663438336138633763303133303661
-34366262396230653466643938363937323438646565633965623662396239613337313961303333
+32376461663037623034303762343332616537333632326132663566303336653333383861303564
-37633231626262316136323633303639643430313562653136636633316464306531313933626636
+31643766343437633462383339366164323636653337656231383238333537656463313663303038
-30343133643935326530353339616431363434643234396261633665326639616335653237303832
+34633463623336663332616364623933363933653539616532326466336235316335666534366663
-35643563363361653130333931326230363738303132326538323036643538353637376635663131
+39616262623364333866643063656365636134326338636338353762323530666131333234313838
-62363138643465326235363236643135656565333936373330303066303139623565303931633962
+65373738333230323338373938376239623236313362636163303465653239666630636564343936
-36353532396533626233626264343231633838366361613265343166386539316633666434373465
+63646362396636326435333439373664393961636533383135613530383135623430613730313030
-34643364373536613939303965643062356463393838333334643634353862643735653634353133
+61373833636364303538633131356365323731363464636362663833393462353661336336313731
-37343234636339343137643062316639666263363066666164353132663763663031613266343833
+61333731643363643534363631313332373339363139613930383134363939366235343062623465
-62363635393563323562636539663539316632316136626462663531316333356630653738353137
+37366564323133313032313538616638393439353633396533623766613838303939616136336336
-38656264323531643362636139353962333562613464653833633132363933616462653835383761
+66633361343863646264623764626161313735613963663638633534353865323635633963393336
-39366435336334663130613565663139363736373263303562373261623261356365356532326231
+36666538633033373432623438633265336535323266663832653961613961383233323336633731
-35613234396139373735656538656134306364326430353665376136346662386664336139333436
+61376630643562336532
-34633332653766306433376362616636323232393532376662363331633133383564313635373834
-61663237386633323433653230613436656232363239633764376537356435353331356431333832
-38313761313039333535343464616534326332336566383230343830353831353666623332353766
-30636266636565363963356434336435383166366234376434326564653461373663316164643163
-64386232643030643537373236376339616632643533306363663130333835323237653237663930
-65633361363834383630373431313034613561653438643666613130636563646634656231643739
-36643939666238323938656632633562376663356463633138613936656530303066613033613931
-33666663666539353936636134613136623136646364363934346231323839653132663664346639
-65613630616632363635353361376538343931373164643335303165326639626233663364396433
-38323264316232383039363938396166306234396164396432386535656465353839626661353663
-34353064343235333731396238356238323134313233653031303466616330616637626365656337
-66653762633332396463396239396531356463386533383031666665396462626136306331386133
-62363736393837396430646263396262356135646562303366353138633538383365636564636332
-30663561616632323937663166616362666432663536323537623565333763356361353435373936
-33633935303566333334613562343035323661336633623432346566646639356137663565366535
-39356335393534646332353037356237633931386131303233613135343131393534633137643661
-30343263333162646135636239373965663566313435313636396266656636653330376166356165
-36643266313037396261626332616362633730333866313262376461306665623230386231373439
-65653732656139346636636365656166306632616130343766623863666463646566316539666362
-62303439633564666430326434323939656237636631333532663932383330633431303731366631
-63333736333932326239326637333136383663343833663761666435626531666665366666303034
-66386539316662333938643161646137316532333366653239643535353730393932643534646665
-30663130323730356466396263663335353563306162333262643666386534396132353035386566
-34393964313533363230633763313432393437313435333030383733356134323766623130663038
-31623636653235323334313762386563663931313936626132353836323139613736666162383539
-37373439663636383662346436306136393065373534663838623336353464306163623632343532
-62636363353534303234356366303862666463343737636238363433383366643734306632646533
-32326535383835613632376566386233356164333961623737623264643830643262646561333339
-38353963363136653761313563353637373061633039653436616431313663326137343237616534
-31626234353166623365613635613266313263373432313364663038653334633635386231303039
-36393266376561616666303134636563376432613535363262383435393532363633666665653761
-30346138356631616365653161306537366263393439303731393062343863356432613032373936
-31663735346536646130666337306132343564633539656433313964353963616465653133373266
-62396333356138616335356333316430363364363161393066343531393162323438326433383463
-38353262306633393862333536643566616162303933643137656437353564303337616634303734
-37666465333966653437303630666632376339643633306432623336386461393939393561376361
-63326436323962343730636430383139313031333662643362633939323737613161346561616665
-31633336366266343563393464613037393066616433343331653762363764656632396264326634
-39393166313761393031376530636136636562613737386364313535613335326634396463613433
-33346662306264353665646632353931356135613638643233366230623330346536343632313835
-61323066376533373637623562383934356164653634313663343530363433656331643966346636
-34326530616137363265336665346164313733656261636139346330646561343764396432353633
-32626335323832653339633935333764633563623465666436653730623264646537313732646332
-32353132373137316165393731383964396238643866646566336238373837633033613333663430
-61363862633761356235333435306634623739623063303638376439356631613639353966656366
-64393633613237353535633662666239306361663366636438343133323163356638383165653330
-37346262663732303738643139366336643466356136653537623338383130643131363263613861
-30373936323530643038653630656162343232326161363662333838386632333061633032663938
-37616464343230613233323434626535366139666232613333316130363230623363383633613866
-38623933353730656462616438636539396234613836376264616462353839616332613665343239
-61613762656565303739636233623863303735393038353438336239326339313262623565313439
-65633330353131643836623635663238333335666165646532323565653939653961313534343431
-33313465313539333361313632396633366461366438313336363631653661666461313366643761
-62346363653031353237663539313935626337666266336163386163383166336262643564643261
-65356536383735396634346234353435356134393863323734383932336333386564333636353861
-66336366363061643932303761633863323534666336386635666664313436386336373565396131
-36626537336237333666643561383632303631326265393462646630666163626238663232633936
-37326537343435636164346238363530373365666163663065633965353064663531613364653733
-62323537303664316462643461623261306431303864303239343963663131353664376131306466
-30623165633732313961356461313639636564666433323364663462373133653038343638623631
-36313530343064653139333431303739636438326363633863373862396431316361356530653339
-66653531626638383435633831613435306566333838636431633636343361386133616138306239
-37313039346330656435383036353232383066656333336235393664656361646163663263306561
-37303831653137306165623936373563656436643037383466303132366462333734353965306536
-65326130313062636232363131396333363266363339386138313636326362393363306634383637
-36323339343035623635333163666235363466393331633366646631303866333533316335316630
-65306139316165633165663232353861363562646435373837343732636362646266373236313565
-61663862323933333131326434323535393633623465356534356132313235343231666561636438
-31313730383934653435643632393333383831656232663437326233636239373836663663326338
-34643262316431653631363137306364623231393165356663356336613237323962303439303230
-66306137313265356631343136653162356331633066356338323463343264616164663161303566
-34633237373930383934343430653764626564376265613038633432373733343130353438633638
-31333863636433383638353132303762323561633431303037653464383236633334633336376531
-35636437303163666234346632623736393033366638633765643265636463316638386637393230
-33383638306563313234616233383733363431373437316437633931343465303331643930316163
-33303636303331656239366335636236636537623839643735356330656132616436373133613036
-65636663303035633935613061633230653238373161356665396536626639333637373537383430
-64383561383837613637306265383162323361313438653866376633393131363035383362653562
-35346231373866656466383834666261393635656239393630663537323031646539336235343361
-37613963633737393963653765623736323662346564373137353565363636346266623866363437
-31663663326233646133343734343363636661326636366432313633306532356438613131363638
-36393036366631386335623866363265396132656365653739613133346532306331656166383065
-63316136326165303230313864386132326562356162306532396263363436323363643836303430
-66653332373766343739646530613630663231386164383231373330623966366134616661626430
-33353835626466656464386662333438363634626361353462363237383032623431383835383038
-64343535383539353032636138353230333139643934623137363438653562326236346433626264
-34353863376162393635386434363530383634383534336530643730366635343964343532313839
-62636265356330616439666330623463633036333036346233333530663034653265366339323838
-34663963356662396439343865373134633962323863396531326565333731376561363831663964
-33376138656330396538343766306435373836373561656537343836363362396262356231643064
-62363934336633336261623637643736336635393835323833303239613862396233326132383335
-36333134376233646335323365353835303437663635616466336136316463313138323233643339
-66636139343230393764343131633539316165303037616463306634316232636534366566633061
-65326230313032633365333237336163326364356466633638353063383231356466633335386630
-32663736336436666634363563646164633165316532663066643636323031633434663565356265
-36363434376233323233363732646366623534366166393030306335353961366132636136386230
-32633233633466633566653130383066643432346662633666643932616530376331373938633735
-31633161376664346238663035346264353131376236323137303435643562633938653834663161
-39613966363165313834373133333931343830376136663164323338643864666437343366356537
-35626562343437366334633337303065326535306334666131343730663431633166616436366139
-35346436333030373837316130623362373465333539353339356463333064343866313861383361
-31366239663130386538383139343661333762633962396230336264363537316430633834303337
-61613962646539353937623035373432626433323863646134336165383261306438646331613735
-31613732333735343437643233643263643161653238323938666532343233333262623964633331
-64333361633362396437316133306437333237616161306165326138373162366163323364636164
-37653239363434383163353663656435386462613261373334366638306365303339663035623135
-64306362313035326432303632643432663730656666376333646363356537376432383862396230
-38336662616462646539663665623538333234363434666538303361656133343837613336316462
-3630

ahoskingit/terraform/terrarist.py

@@ -56,12 +56,13 @@ if __name__ == "__main__":
     data = vault.load(open(args.vault_file).read())
 
     create_credentials()
+    print('Running Terraform now...\n')
 
     cmd = ["terraform", args.action, "--var",
            "environment=%s" % args.environment]
 
     for key, value in data.items():
-        cmd.append("--var")
+        cmd.append("-var")
         cmd.append("'%s=%s'" % (key, value))
 
     for option in options:
@@ -82,4 +83,4 @@ if __name__ == "__main__":
         sys.exit(x)
     else:  # Python 3
         x = os.system(' '.join(cmd))
-        sys.exit(x)
+        sys.exit(x)

ahoskingit/terraform/var_homeip.tfvar

@@ -1 +1 @@
-home_ip = "70.27.17.5"
+home_ip = "70.27.17.5"

ahoskingit/terraform/variables.tf

@@ -7,19 +7,10 @@ variable "aws_region" {
         default = "us-east-1"
 }
 
-variable "cloudflare_email" {}
+variable "CLOUDFLARE_EMAIL" {}
-variable "cloudflare_token" {}
+variable "CLOUDFLARE_API_TOKEN" {}
-
+variable "CLOUDFLARE_ACCOUNT_ID" {}
-
+variable "CLOUDFLARE_API_KEY" {}
-## GCP Credentias requirements
-#variable "gcp_private_key_id" {}
-#variable "GOOGLE_CLOUD_KEYFILE_JSON" {}
-#variable "gcp_region" {
-#  default = "us-east1"
-#}
-variable "gcp_project" {
-  default = "ahoskingit"
-}
 
 variable "home_ip" {
     default = "70.27.17.5"
@@ -48,3 +39,4 @@ variable "studi-odesign_ca" { default = "studi-odesign.ca"}
 #variable "vsphere_user" {}
 #variable "vsphere_password" {}
 #variable "vsphere_server" {}
+variable "environment" {}