update

examples/full-setup-tf-upgrade/flowlogs.tf

@@ -4,7 +4,8 @@ module "flowlogs" {
   vpc_full_name = var.vpc_full_name
   account_alias = var.account_alias
 
-  flowlog_bucket_arn = data.terraform_remote_state.infrastructure_east.outputs.flowlogs_arn
+  # replace REGION with east or west, based on the region of the VPC you are building
+  flowlog_bucket_arn = data.terraform_remote_state.infrastructure_REGION.outputs.flowlogs_arn
   flowlog_role_arn   = data.terraform_remote_state.common.outputs.role_flowlogs_arn
 
   vpc_name       = var.vpc_name

examples/full-setup-tf-upgrade/tf-run.data

@@ -1,27 +1,30 @@
-VERSION 1.1.2
+VERSION 1.2.0
 REMOTE-STATE
 COMMAND tf-directory-setup.py -l none -f
 COMMAND setup-new-directory.sh
 COMMAND tf-init -upgrade
+
 LINKTOP provider_configs.d/provider.infoblox.auto.tfvars
 LINKTOP provider_configs.d/provider.infoblox.tf
 LINKTOP provider_configs.d/provider.infoblox.variables.tf
+LINKTOP common/remote_state.common.tf
+LINKTOP infrastructure/%%SHORT_REGION%%/remote_state.infrastructure_%%SHORT_REGION%%.tf
 
 module.vpc module.subnets
 COMMAND tf-directory-setup.py -l s3
+
+COMMENT Until you reach this point with a tf-run apply, a plan action will fail as there are resources which need to be created
+PAUSE
+
 module.routing
 module.vpn
-COMMENT link remote states
-COMMAND ln -sf ../../../common/remote_state.common.tf
-COMMENT ln -sf ../../../infrastructure/{short-region}/remote_state.infrastructure_{short-region}.tf
-STOP    make sure the appropriate infrastructure_{region}.tf is linked
 module.flowlogs
 module.base-security-groups
 module.sg_web
 module.nacls module.nacls_enterprise module.nacls_endpoints module.nacls_public_vpc module.nacls_public_nat
-# STOP make sure peer configurations are setup properly
 module.peer_services_main_west module.peer_services_main_east
 ALL
 ALL
 
-
+COMMENT continue setup for apps: cd apps; tf-run apply
+COMMENT continue setup for apps/dns: cd apps/dns; tf-run apply

examples/full-setup-tf-upgrade/variables.subnets.auto.tfvars

@@ -1,16 +1,16 @@
 public_subnets = [
-  ##  { base_cidr = "10.188.64.0/24", label = "public", bits = 2, private = false, tags = {} },
+  ##  { base_cidr = "10.188.64.0/24", label = "public", bits = 2, private = false, enabled=false, tags = {} },
 ]
 private_subnets = [
-  { base_cidr = "10.188.65.0/24", label = "endpoints", bits = 2, private = true, tags = {} },
-  { base_cidr = "10.188.66.0/23", label = "private-lb", bits = 2, private = true,
+  { base_cidr = "10.188.65.0/24", label = "endpoints", bits = 2, private = true, enabled = true, tags = {} },
+  { base_cidr = "10.188.66.0/23", label = "private-lb", bits = 2, private = true, enabled = true,
     tags      = { "kubernetes.io/role/internal-elb" = 1 }
   },
-  { base_cidr = "10.188.68.0/23", label = "db", bits = 2, private = true, tags = {} },
-  # { base_cidr = "10.188.70.0/23", label = "(free)", bits = 2, private = true, tags = {} },
-  { base_cidr = "10.188.72.0/22", label = "apps", bits = 2, private = true, tags = {} },
-  # { base_cidr = "10.188.76.0/22", label = "(free)", bits = 2, private = true, tags = {} },
-  { base_cidr = "10.188.80.0/21", label = "container", bits = 2, private = true,
+  { base_cidr = "10.188.68.0/23", label = "db", bits = 2, private = true, enabled = true, tags = {} },
+  # { base_cidr = "10.188.70.0/23", label = "(free)", bits = 2, private = true, enabled=false, tags = {} },
+  { base_cidr = "10.188.72.0/22", label = "apps", bits = 2, private = true, enabled = true, tags = {} },
+  # { base_cidr = "10.188.76.0/22", label = "(free)", bits = 2, private = true, enabled=false, tags = {} },
+  { base_cidr = "10.188.80.0/21", label = "container", bits = 2, private = true, enabled = true,
     tags = {
       #      "kubernetes.io/cluster/dice-ite" = "shared"
     },