Upgrade Geodesic and Terraform Root Modules (#43)

* Upgrade root modules

* add users

* upgrade tfrm

Author: osterman

Dockerfile

@@ -1,6 +1,6 @@
-FROM cloudposse/terraform-root-modules:0.6.0 as terraform-root-modules
+FROM cloudposse/terraform-root-modules:0.11.0 as terraform-root-modules
 
-FROM cloudposse/geodesic:0.38.0
+FROM cloudposse/geodesic:0.46.0
 
 ENV DOCKER_IMAGE="cloudposse/root.cloudposse.co"
 ENV DOCKER_TAG="latest"
@@ -11,38 +11,18 @@ ENV BANNER="root.cloudposse.co"
 # AWS Region
 ENV AWS_REGION="us-west-2"
 ENV AWS_DEFAULT_REGION="${AWS_REGION}"
+ENV AWS_ACCOUNT_ID="323330167063"
+ENV AWS_ROOT_ACCOUNT_ID="${AWS_ACCOUNT_ID}"
 
 # Terraform vars
 ENV TF_VAR_region="${AWS_REGION}"
-ENV TF_VAR_account_id="323330167063"
+ENV TF_VAR_account_id="${AWS_ACCOUNT_ID}"
 ENV TF_VAR_namespace="cpco"
 ENV TF_VAR_stage="root"
 
 ENV TF_VAR_parent_domain_name="cloudposse.co"
 ENV TF_VAR_root_domain_name="root.cloudposse.co"
 
-ENV TF_VAR_prod_account_email="info+prod@cloudposse.co"
-ENV TF_VAR_prod_account_id="845778104613"
-ENV TF_VAR_prod_name_servers='["ns-1105.awsdns-10.org", "ns-1801.awsdns-33.co.uk", "ns-414.awsdns-51.com", "ns-835.awsdns-40.net"]'
-
-ENV TF_VAR_staging_account_email="info+staging@cloudposse.co"
-ENV TF_VAR_staging_account_id="781281608584"
-ENV TF_VAR_staging_name_servers='["ns-1029.awsdns-00.org", "ns-1798.awsdns-32.co.uk", "ns-38.awsdns-04.com", "ns-776.awsdns-33.net"]'
-
-ENV TF_VAR_audit_account_email="info+audit@cloudposse.co"
-ENV TF_VAR_audit_account_id="205035139483"
-ENV TF_VAR_audit_name_servers='["ns-1343.awsdns-39.org", "ns-2001.awsdns-58.co.uk", "ns-330.awsdns-41.com", "ns-881.awsdns-46.net"]'
-
-ENV TF_VAR_dev_account_email="info+dev@cloudposse.co"
-ENV TF_VAR_dev_account_id="838456590850"
-ENV TF_VAR_dev_name_servers='["ns-112.awsdns-14.com", "ns-1485.awsdns-57.org", "ns-1655.awsdns-14.co.uk", "ns-613.awsdns-12.net"]'
-
-ENV TF_VAR_testing_account_email="info+testing@cloudposse.co"
-ENV TF_VAR_testing_account_id="126450723953"
-ENV TF_VAR_testing_name_servers='["ns-312.awsdns-39.com", "ns-1416.awsdns-49.org", "ns-619.awsdns-13.net", "ns-1794.awsdns-32.co.uk"]'
-
-ENV TF_VAR_local_name_servers='["", "", "", ""]'
-
 # Terraform state bucket and DynamoDB table for state locking
 ENV TF_BUCKET_REGION="${AWS_REGION}"
 ENV TF_BUCKET="${TF_VAR_namespace}-${TF_VAR_stage}-terraform-state"

conf/accounts/terraform.tfvars

@@ -0,0 +1,2 @@
+account_email = "info+%s@cloudposse.co"
+accounts_enabled = ["dev", "staging", "prod", "testing", "audit"]

conf/iam/terraform.tfvars

@@ -1,3 +1,5 @@
+accounts_enabled = ["dev", "staging", "prod", "testing", "audit"]
+
 prod_account_user_names = [
   "admin@cloudposse.co",
   "erik@cloudposse.com",
@@ -24,6 +26,8 @@ dev_account_user_names = [
   "erik@cloudposse.com",
   "vadzim@cloudposse.com",
   "aliaksandr@cloudposse.com",
+  "solairerove",
+  "josh"
 ]
 
 testing_account_user_names = [